pidgin: 6c3b40d1: Convert sametime prpl to use accessor fu...
andrew.victor at mxit.com
andrew.victor at mxit.com
Tue Aug 30 18:26:30 EDT 2011
----------------------------------------------------------------------
Revision: 6c3b40d10cfdd7ae069810d596532c52a8c58fb0
Parent: a0842f4abfffe1bc5860aaa2e2db4d77d653c713
Author: andrew.victor at mxit.com
Date: 08/30/11 15:32:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6c3b40d10cfdd7ae069810d596532c52a8c58fb0
Changelog:
Convert sametime prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Changes against parent a0842f4abfffe1bc5860aaa2e2db4d77d653c713
patched libpurple/protocols/sametime/sametime.c
-------------- next part --------------
============================================================
--- libpurple/protocols/sametime/sametime.c 2f82595a6ed909f8de356b28e2528dfc4cc17f86
+++ libpurple/protocols/sametime/sametime.c 4a7aa31588d374a7f628711172217746941a2106
@@ -197,7 +197,7 @@ static guint log_handler[2] = { 0, 0 };
/** the purple plugin data.
- available as gc->proto_data and mwSession_getClientData */
+ available as purple_connection_get_protocol_data(gc) and mwSession_getClientData */
struct mwPurplePluginData {
struct mwSession *session;
@@ -320,7 +320,7 @@ static struct mwSession *gc_to_session(P
g_return_val_if_fail(gc != NULL, NULL);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_val_if_fail(pd != NULL, NULL);
return pd->session;
@@ -499,7 +499,7 @@ static void mw_aware_list_on_aware(struc
gc = mwAwareList_getClientData(list);
acct = purple_connection_get_account(gc);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
idle = aware->status.time;
stat = aware->status.status;
id = aware->id.user;
@@ -851,7 +851,7 @@ static PurpleBuddy *buddy_ensure(PurpleC
static PurpleBuddy *buddy_ensure(PurpleConnection *gc, PurpleGroup *group,
struct mwSametimeUser *stuser) {
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
PurpleBuddy *buddy;
PurpleAccount *acct = purple_connection_get_account(gc);
@@ -968,7 +968,7 @@ static PurpleGroup *group_ensure(PurpleC
if(type == mwSametimeGroup_DYNAMIC) {
purple_blist_node_set_string(gn, GROUP_KEY_OWNER, owner);
- group_add(gc->proto_data, group);
+ group_add(purple_connection_get_protocol_data(gc), group);
}
return group;
@@ -3192,7 +3192,7 @@ static struct mwPurplePluginData *mwPurp
mwSession_addCipher(pd->session, mwCipher_new_RC2_128(pd->session));
mwSession_setClientData(pd->session, pd, NULL);
- gc->proto_data = pd;
+ purple_connection_set_protocol_data(gc, pd);
return pd;
}
@@ -3201,7 +3201,7 @@ static void mwPurplePluginData_free(stru
static void mwPurplePluginData_free(struct mwPurplePluginData *pd) {
g_return_if_fail(pd != NULL);
- pd->gc->proto_data = NULL;
+ purple_connection_set_protocol_data(pd->gc, NULL);
mwSession_removeService(pd->session, mwService_AWARE);
mwSession_removeService(pd->session, mwService_CONFERENCE);
@@ -3263,7 +3263,7 @@ static char *mw_prpl_status_text(PurpleB
const char *ret = NULL;
if ((gc = purple_account_get_connection(purple_buddy_get_account(b)))
- && (pd = gc->proto_data))
+ && (pd = purple_connection_get_protocol_data(gc)))
ret = mwServiceAware_getText(pd->srvc_aware, &t);
return (ret && g_utf8_validate(ret, -1, NULL)) ? g_markup_escape_text(ret, -1): NULL;
@@ -3326,7 +3326,7 @@ static void mw_prpl_tooltip_text(PurpleB
char *tmp;
if ((gc = purple_account_get_connection(purple_buddy_get_account(b)))
- && (pd = gc->proto_data))
+ && (pd = purple_connection_get_protocol_data(gc)))
message = mwServiceAware_getText(pd->srvc_aware, &idb);
status = status_text(b);
@@ -3403,7 +3403,7 @@ static void conf_create_prompt_join(Purp
acct = purple_buddy_get_account(buddy);
gc = purple_account_get_connection(acct);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
srvc = pd->srvc_conf;
f = purple_request_fields_get_field(fields, CHAT_KEY_TOPIC);
@@ -3569,7 +3569,7 @@ static void blist_menu_conf(PurpleBlistN
gc = purple_account_get_connection(acct);
g_return_if_fail(gc != NULL);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
/*
@@ -3608,7 +3608,7 @@ static void blist_menu_announce(PurpleBl
gc = purple_account_get_connection(acct);
g_return_if_fail(gc != NULL);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
rcpt_name = g_strdup_printf("@U %s", buddy->name);
@@ -3813,7 +3813,7 @@ static void mw_prpl_close(PurpleConnecti
g_return_if_fail(gc != NULL);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
/* get rid of the blist save timeout */
@@ -3827,7 +3827,7 @@ static void mw_prpl_close(PurpleConnecti
mwSession_stop(pd->session, 0x00);
/* no longer necessary */
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
/* stop watching the socket */
if(gc->inpa) {
@@ -4018,7 +4018,7 @@ static int mw_prpl_send_im(PurpleConnect
struct mwConversation *conv;
g_return_val_if_fail(gc != NULL, 0);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_val_if_fail(pd != NULL, 0);
@@ -4093,7 +4093,7 @@ static unsigned int mw_prpl_send_typing(
gpointer t = GINT_TO_POINTER(!! state);
g_return_val_if_fail(gc != NULL, 0);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_val_if_fail(pd != NULL, 0);
@@ -4189,7 +4189,7 @@ static void mw_prpl_get_info(PurpleConne
g_return_if_fail(who != NULL);
g_return_if_fail(*who != '\0');
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
acct = purple_connection_get_account(gc);
b = purple_find_buddy(acct, who);
@@ -4434,7 +4434,7 @@ static void add_buddy_resolved(struct mw
buddy = data->buddy;
gc = purple_account_get_connection(purple_buddy_get_account(buddy));
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
if(results)
res = results->data;
@@ -4515,7 +4515,7 @@ static void mw_prpl_add_buddy(PurpleConn
PurpleBuddy *buddy,
PurpleGroup *group) {
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
struct mwServiceResolve *srvc;
GList *query;
enum mwResolveFlag flags;
@@ -4566,7 +4566,7 @@ static void mw_prpl_add_buddies(PurpleCo
GHashTable *group_sets;
struct mwAwareIdBlock *idbs, *idb;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
/* map PurpleGroup:GList of mwAwareIdBlock */
group_sets = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -4617,7 +4617,7 @@ static void mw_prpl_remove_buddy(PurpleC
GList *rem = g_list_prepend(NULL, &idb);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
group = purple_buddy_get_group(buddy);
list = list_ensure(pd, group);
@@ -4664,7 +4664,7 @@ static void mw_prpl_set_permit_deny(Purp
acct = purple_connection_get_account(gc);
g_return_if_fail(acct != NULL);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
session = pd->session;
@@ -4748,7 +4748,7 @@ static void mw_prpl_join_chat(PurpleConn
struct mwPurplePluginData *pd;
char *c, *t;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
c = g_hash_table_lookup(components, CHAT_KEY_NAME);
t = g_hash_table_lookup(components, CHAT_KEY_TOPIC);
@@ -4790,7 +4790,7 @@ static void mw_prpl_reject_chat(PurpleCo
struct mwServiceConference *srvc;
char *c;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
srvc = pd->srvc_conf;
if(g_hash_table_lookup(components, CHAT_KEY_IS_PLACE)) {
@@ -4822,7 +4822,7 @@ static void mw_prpl_chat_invite(PurpleCo
struct mwPlace *place;
struct mwIdBlock idb = { (char *) who, NULL };
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
conf = ID_TO_CONF(pd, id);
@@ -4846,7 +4846,7 @@ static void mw_prpl_chat_leave(PurpleCon
struct mwPurplePluginData *pd;
struct mwConference *conf;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
conf = ID_TO_CONF(pd, id);
@@ -4882,7 +4882,7 @@ static int mw_prpl_chat_send(PurpleConne
char *msg;
int ret;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_val_if_fail(pd != NULL, 0);
conf = ID_TO_CONF(pd, id);
@@ -4920,7 +4920,7 @@ static void mw_prpl_alias_buddy(PurpleCo
const char *who,
const char *alias) {
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
/* it's a change to the buddy list, so we've gotta reflect that in
@@ -4938,7 +4938,7 @@ static void mw_prpl_group_buddy(PurpleCo
struct mwAwareIdBlock idb = { mwAware_USER, (char *) who, NULL };
GList *gl = g_list_prepend(NULL, &idb);
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
PurpleGroup *group;
struct mwAwareList *list;
@@ -4964,7 +4964,7 @@ static void mw_prpl_rename_group(PurpleC
PurpleGroup *group,
GList *buddies) {
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
/* it's a change in the buddy list, so we've gotta reflect that in
@@ -4984,7 +4984,7 @@ static void mw_prpl_convo_closed(PurpleC
static void mw_prpl_convo_closed(PurpleConnection *gc, const char *who) {
- struct mwPurplePluginData *pd = gc->proto_data;
+ struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
struct mwServiceIm *srvc;
struct mwConversation *conv;
struct mwIdBlock idb = { (char *) who, NULL };
@@ -5019,7 +5019,7 @@ static void mw_prpl_remove_group(PurpleC
struct mwPurplePluginData *pd;
struct mwAwareList *list;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_if_fail(pd != NULL);
g_return_if_fail(pd->group_list_map != NULL);
@@ -5043,7 +5043,7 @@ static gboolean mw_prpl_can_receive_file
g_return_val_if_fail(gc != NULL, FALSE);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
g_return_val_if_fail(pd != NULL, FALSE);
srvc = pd->srvc_aware;
@@ -5075,7 +5075,7 @@ static void ft_outgoing_init(PurpleXfer
acct = purple_xfer_get_account(xfer);
gc = purple_account_get_connection(acct);
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
srvc = pd->srvc_ft;
filename = purple_xfer_get_local_filename(xfer);
@@ -5534,7 +5534,7 @@ static void remote_group_action_cb(Purpl
enum mwResolveFlag flags;
guint32 req;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
srvc = pd->srvc_resolve;
query = g_list_prepend(NULL, (char *) name);
@@ -5659,7 +5659,7 @@ static void search_action_cb(PurpleConne
enum mwResolveFlag flags;
guint32 req;
- pd = gc->proto_data;
+ pd = purple_connection_get_protocol_data(gc);
srvc = pd->srvc_resolve;
query = g_list_prepend(NULL, (char *) name);
More information about the Commits
mailing list