pidgin: 36efba43: Don't access PurpleConnection->proto_dat...
andrew.victor at mxit.com
andrew.victor at mxit.com
Tue Aug 23 17:45:58 EDT 2011
----------------------------------------------------------------------
Revision: 36efba43ab7aa1f9fc4160cf3829e3eb22e19e18
Parent: ff884d612889ec8d5f9c23a58e101ce65245ea19
Author: andrew.victor at mxit.com
Date: 08/23/11 16:43:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/36efba43ab7aa1f9fc4160cf3829e3eb22e19e18
Changelog:
Don't access PurpleConnection->proto_data directly, rather use the access functions.
Changes against parent ff884d612889ec8d5f9c23a58e101ce65245ea19
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/filexfer.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/multimx.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/mxit/roster.c
patched libpurple/protocols/mxit/splashscreen.c
patched libpurple/protocols/mxit/voicevideo.c
-------------- next part --------------
============================================================
--- libpurple/protocols/mxit/actions.c e35847c7c937bdcab33b4327d66c4ad9a517fde7
+++ libpurple/protocols/mxit/actions.c d890a80f2e317c541954666154e7c4b6d04041ed
@@ -43,7 +43,7 @@ static void mxit_profile_cb( PurpleConne
*/
static void mxit_profile_cb( PurpleConnection* gc, PurpleRequestFields* fields )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc ) ;
PurpleRequestField* field = NULL;
const char* name = NULL;
const char* bday = NULL;
@@ -200,7 +200,7 @@ static void mxit_profile_action( PurpleP
static void mxit_profile_action( PurplePluginAction* action )
{
PurpleConnection* gc = (PurpleConnection*) action->context;
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
struct MXitProfile* profile = session->profile;
PurpleRequestFields* fields = NULL;
@@ -297,7 +297,7 @@ static void mxit_change_pin_cb( PurpleCo
*/
static void mxit_change_pin_cb( PurpleConnection* gc, PurpleRequestFields* fields )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
const char* pin = NULL;
const char* pin2 = NULL;
const char* err = NULL;
@@ -359,7 +359,7 @@ static void mxit_change_pin_action( Purp
static void mxit_change_pin_action( PurplePluginAction* action )
{
PurpleConnection* gc = (PurpleConnection*) action->context;
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleRequestFields* fields = NULL;
PurpleRequestFieldGroup* group = NULL;
@@ -395,7 +395,7 @@ static void mxit_splash_action( PurplePl
static void mxit_splash_action( PurplePluginAction* action )
{
PurpleConnection* gc = (PurpleConnection*) action->context;
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
if ( splash_current( session ) != NULL )
splash_display( session );
@@ -432,7 +432,7 @@ static void mxit_suggested_friends_actio
static void mxit_suggested_friends_action( PurplePluginAction* action )
{
PurpleConnection* gc = (PurpleConnection*) action->context;
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
const char* profilelist[] = {
CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME, CP_PROFILE_FIRSTNAME,
CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY, CP_PROFILE_STATUS, CP_PROFILE_AVATAR,
@@ -449,7 +449,7 @@ static void mxit_user_search_cb( PurpleC
*/
static void mxit_user_search_cb( PurpleConnection *gc, const char *input )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
const char* profilelist[] = {
CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME, CP_PROFILE_FIRSTNAME,
CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY, CP_PROFILE_STATUS, CP_PROFILE_AVATAR,
============================================================
--- libpurple/protocols/mxit/filexfer.c 50e87d30c7fb89e91dc5cb5cd7df57457a9cf26b
+++ libpurple/protocols/mxit/filexfer.c 702f1f34e03554a3897c7e92381f37d592dca166
@@ -295,7 +295,7 @@ PurpleXfer* mxit_xfer_new( PurpleConnect
*/
PurpleXfer* mxit_xfer_new( PurpleConnection* gc, const char* who )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleXfer* xfer = NULL;
struct mxitxfer* mx = NULL;
============================================================
--- libpurple/protocols/mxit/login.c c7e21c05defc7a351d65a40f5374043f3efd4c62
+++ libpurple/protocols/mxit/login.c e64fff48b5428cfeaa2afd193fbcfbdfe652643e
@@ -49,8 +49,8 @@ static struct MXitSession* mxit_create_o
*/
static struct MXitSession* mxit_create_object( PurpleAccount* account )
{
+ PurpleConnection* con = purple_account_get_connection( account );
struct MXitSession* session = NULL;
- PurpleConnection* con = NULL;
/* currently the wapsite does not handle a '+' in front of the username (mxitid) so we just strip it */
if ( account->username[0] == '+' ) {
@@ -63,16 +63,13 @@ static struct MXitSession* mxit_create_o
}
session = g_new0( struct MXitSession, 1 );
+ session->con = con;
+ session->acc = account;
/* configure the connection (reference: "libpurple/connection.h") */
- con = purple_account_get_connection( account );
- con->proto_data = session;
+ purple_connection_set_protocol_data( con, session );
con->flags |= PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_SUPPORT_MOODS;
- session->con = con;
- /* add account */
- session->acc = account;
-
/* configure the session (reference: "libpurple/account.h") */
g_strlcpy( session->server, purple_account_get_string( account, MXIT_CONFIG_SERVER_ADDR, DEFAULT_SERVER ), sizeof( session->server ) );
g_strlcpy( session->http_server, purple_account_get_string( account, MXIT_CONFIG_HTTPSERVER, DEFAULT_HTTP_SERVER ), sizeof( session->http_server ) );
@@ -221,7 +218,7 @@ static void mxit_cb_register_ok( PurpleC
*/
static void mxit_cb_register_ok( PurpleConnection *gc, PurpleRequestFields *fields )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
struct MXitProfile* profile = session->profile;
const char* str;
const char* pin;
@@ -507,7 +504,7 @@ static void mxit_cb_captcha_ok( PurpleCo
*/
static void mxit_cb_captcha_ok( PurpleConnection* gc, PurpleRequestFields* fields )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleUtilFetchUrlData* url_data;
PurpleRequestField* field;
const char* captcha_resp;
@@ -571,7 +568,7 @@ static void mxit_cb_captcha_cancel( Purp
*/
static void mxit_cb_captcha_cancel( PurpleConnection* gc, PurpleRequestFields* fields )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
/* free up the login resources */
free_logindata( session->logindata );
============================================================
--- libpurple/protocols/mxit/multimx.c 13b5a9211d1f5cba73b4aae7db1266289b9f8961
+++ libpurple/protocols/mxit/multimx.c a274454c16695c53ff7e0175aa7dc5b5ac7d9eed
@@ -458,7 +458,7 @@ void mxit_chat_join(PurpleConnection *gc
*/
void mxit_chat_join(PurpleConnection *gc, GHashTable *components)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
const char* roomname = NULL;
struct multimx* multimx = NULL;
@@ -500,7 +500,7 @@ void mxit_chat_reject(PurpleConnection *
*/
void mxit_chat_reject(PurpleConnection *gc, GHashTable* components)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
const char* roomname = NULL;
struct multimx* multimx = NULL;
@@ -543,7 +543,7 @@ void mxit_chat_invite(PurpleConnection *
*/
void mxit_chat_invite(PurpleConnection *gc, int id, const char *msg, const char *username)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
struct multimx* multimx = NULL;
PurpleBuddy* buddy;
PurpleConversation *convo;
@@ -589,7 +589,7 @@ void mxit_chat_leave(PurpleConnection *g
*/
void mxit_chat_leave(PurpleConnection *gc, int id)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
struct multimx* multimx = NULL;
purple_debug_info(MXIT_PLUGIN_ID, "Groupchat %i leave\n", id);
@@ -620,7 +620,7 @@ int mxit_chat_send(PurpleConnection *gc,
*/
int mxit_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMessageFlags flags)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
struct multimx* multimx = NULL;
const char* nickname;
============================================================
--- libpurple/protocols/mxit/mxit.c a8f4ec32f53ec29d6e4e9b1eb6ae9a4a822fafeb
+++ libpurple/protocols/mxit/mxit.c 9803d1bb8661fd2e2bb1bd15da3090f60e6483cf
@@ -58,7 +58,7 @@ static void* mxit_link_click( const char
static void* mxit_link_click( const char* link64 )
{
PurpleAccount* account;
- PurpleConnection* con;
+ PurpleConnection* gc;
gchar** parts = NULL;
gchar* link = NULL;
gsize len;
@@ -91,15 +91,15 @@ static void* mxit_link_click( const char
account = purple_accounts_find( parts[1], parts[2] );
if ( !account )
goto skip;
- con = purple_account_get_connection( account );
- if ( !con )
+ gc = purple_account_get_connection( account );
+ if ( !gc )
goto skip;
/* determine if it's a command-response to send */
is_command = ( atoi( parts[4] ) == 1 );
/* send click message back to MXit */
- mxit_send_message( con->proto_data, parts[3], parts[5], FALSE, is_command );
+ mxit_send_message( purple_connection_get_protocol_data( gc ), parts[3], parts[5], FALSE, is_command );
g_free( link );
link = NULL;
@@ -370,7 +370,7 @@ static void mxit_close( PurpleConnection
*/
static void mxit_close( PurpleConnection* gc )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
/* disable signals */
mxit_disable_signals( session );
@@ -406,7 +406,7 @@ static int mxit_send_im( PurpleConnectio
{
purple_debug_info( MXIT_PLUGIN_ID, "Sending message '%s' to buddy '%s'\n", message, who );
- mxit_send_message( gc->proto_data, who, message, TRUE, FALSE );
+ mxit_send_message( purple_connection_get_protocol_data( gc ), who, message, TRUE, FALSE );
return 1; /* echo to conversation window */
}
@@ -420,7 +420,7 @@ static void mxit_set_status( PurpleAccou
*/
static void mxit_set_status( PurpleAccount* account, PurpleStatus* status )
{
- struct MXitSession* session = purple_account_get_connection( account )->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( purple_account_get_connection( account ) );
const char* statusid;
int presence;
char* statusmsg1;
@@ -513,7 +513,7 @@ static void mxit_keepalive( PurpleConnec
*/
static void mxit_keepalive( PurpleConnection *gc )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
/* if not logged in, there is nothing to do */
if ( !( session->flags & MXIT_FLAG_LOGGEDIN ) )
@@ -541,7 +541,7 @@ static void mxit_set_buddy_icon( PurpleC
*/
static void mxit_set_buddy_icon( PurpleConnection *gc, PurpleStoredImage *img )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
if ( img == NULL )
mxit_set_avatar( session, NULL, 0 );
@@ -560,7 +560,7 @@ static void mxit_get_info( PurpleConnect
{
PurpleBuddy* buddy;
struct contact* contact;
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
const char* profilelist[] = { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME,
CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY, CP_PROFILE_LASTSEEN,
CP_PROFILE_STATUS, CP_PROFILE_AVATAR, CP_PROFILE_WHEREAMI, CP_PROFILE_ABOUTME };
@@ -611,13 +611,10 @@ static void mxit_reinvite( PurpleBlistNo
static void mxit_reinvite( PurpleBlistNode *node, gpointer ignored )
{
PurpleBuddy* buddy = (PurpleBuddy *) node;
- PurpleConnection* gc;
- struct MXitSession* session;
+ PurpleConnection* gc = purple_account_get_connection( purple_buddy_get_account( buddy ) );
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
struct contact* contact;
- gc = purple_account_get_connection( purple_buddy_get_account( buddy ) );
- session = gc->proto_data;
-
contact = purple_buddy_get_protocol_data( (PurpleBuddy*) node );
if ( !contact )
return;
============================================================
--- libpurple/protocols/mxit/roster.c ae7790bbd739414b18561e0297bbf50fa1af023e
+++ libpurple/protocols/mxit/roster.c 1da0c931d13c21c70476622ec98c4e4a6177674d
@@ -728,7 +728,7 @@ void mxit_add_buddy( PurpleConnection* g
*/
void mxit_add_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* group, const char* message )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
GSList* list = NULL;
PurpleBuddy* mxbuddy = NULL;
unsigned int i;
@@ -804,7 +804,7 @@ void mxit_remove_buddy( PurpleConnection
*/
void mxit_remove_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* group )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
const gchar * buddy_name = purple_buddy_get_name( buddy );
purple_debug_info( MXIT_PLUGIN_ID, "mxit_remove_buddy '%s'\n", buddy_name );
@@ -822,7 +822,7 @@ void mxit_buddy_alias( PurpleConnection*
*/
void mxit_buddy_alias( PurpleConnection* gc, const char* who, const char* alias )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleBuddy* buddy = NULL;
PurpleGroup* group = NULL;
@@ -856,7 +856,7 @@ void mxit_buddy_group( PurpleConnection*
*/
void mxit_buddy_group( PurpleConnection* gc, const char* who, const char* old_group, const char* new_group )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleBuddy* buddy = NULL;
purple_debug_info( MXIT_PLUGIN_ID, "mxit_buddy_group from '%s' to '%s'\n", old_group, new_group );
@@ -883,7 +883,7 @@ void mxit_rename_group( PurpleConnection
*/
void mxit_rename_group( PurpleConnection* gc, const char* old_name, PurpleGroup* group, GList* moved_buddies )
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data( gc );
PurpleBuddy* buddy = NULL;
GList* item = NULL;
============================================================
--- libpurple/protocols/mxit/splashscreen.c ea0c77abaf1981e197f5ab7b4b03b653e84c9d40
+++ libpurple/protocols/mxit/splashscreen.c 8ae7d93b5b835a5ed37825cf4a48f76dddad9c73
@@ -144,7 +144,7 @@ static void splash_click_ok(PurpleConnec
*/
static void splash_click_ok(PurpleConnection* gc, PurpleRequestFields* fields)
{
- struct MXitSession* session = (struct MXitSession*) gc->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(gc);
const char* splashId;
/* Get current splash ID */
============================================================
--- libpurple/protocols/mxit/voicevideo.c 9f8067b027c3d3099abf07c10e464fe20257ec6f
+++ libpurple/protocols/mxit/voicevideo.c fc8c14ce76910f6579a783ee22d82f6935697164
@@ -63,7 +63,7 @@ PurpleMediaCaps mxit_media_caps(PurpleAc
*/
PurpleMediaCaps mxit_media_caps(PurpleAccount *account, const char *who)
{
- struct MXitSession* session = purple_account_get_connection(account)->proto_data;
+ struct MXitSession* session = purple_connection_get_protocol_data(purple_account_get_connection(account));
PurpleBuddy* buddy;
struct contact* contact;
PurpleMediaCaps capa = PURPLE_MEDIA_CAPS_NONE;
More information about the Commits
mailing list