pidgin.next.minor: f5288ef4: More struct hiding work
rlaager at pidgin.im
rlaager at pidgin.im
Fri Oct 31 01:10:37 EDT 2008
-----------------------------------------------------------------
Revision: f5288ef412711861bacd78dba56c4963826d86ed
Ancestor: 19c0e49559540d8109637d5a59f06acab52312ae
Author: rlaager at pidgin.im
Date: 2008-10-31T05:08:57
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/f5288ef412711861bacd78dba56c4963826d86ed
Modified files:
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/google.c
ChangeLog:
More struct hiding work
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c 69039f61c78b7d32d53c0cca4e92405ec580900b
+++ libpurple/protocols/jabber/buddy.c eaf549015a47339c7e518bd7864a834ab0ac5458
@@ -419,7 +419,7 @@ void jabber_set_info(PurpleConnection *g
{
PurpleStoredImage *img;
JabberIq *iq;
- JabberStream *js = gc->proto_data;
+ JabberStream *js = purple_connection_get_protocol_data(gc);
xmlnode *vc_node;
const struct tag_attr *tag_attr;
@@ -496,7 +496,7 @@ void jabber_set_buddy_icon(PurpleConnect
PurplePresence *gpresence;
PurpleStatus *status;
- if(((JabberStream*)gc->proto_data)->pep) {
+ if(((JabberStream*)purple_connection_get_protocol_data(gc))->pep) {
/* XEP-0084: User Avatars */
if(img) {
/*
@@ -568,7 +568,7 @@ void jabber_set_buddy_icon(PurpleConnect
g_free(base64avatar);
/* publish the avatar itself */
- jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+ jabber_pep_publish((JabberStream*)purple_connection_get_protocol_data(gc), publish);
/* next step: publish the metadata */
publish = xmlnode_new("publish");
@@ -594,7 +594,7 @@ void jabber_set_buddy_icon(PurpleConnect
g_free(heightstring);
/* publish the metadata */
- jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+ jabber_pep_publish((JabberStream*)purple_connection_get_protocol_data(gc), publish);
g_free(hash);
} else { /* if(img) */
@@ -611,7 +611,7 @@ void jabber_set_buddy_icon(PurpleConnect
xmlnode_new_child(metadata, "stop");
/* publish the metadata */
- jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+ jabber_pep_publish((JabberStream*)purple_connection_get_protocol_data(gc), publish);
}
} else {
purple_debug(PURPLE_DEBUG_ERROR, "jabber",
@@ -1797,7 +1797,7 @@ void jabber_buddy_get_info(PurpleConnect
void jabber_buddy_get_info(PurpleConnection *gc, const char *who)
{
- JabberStream *js = gc->proto_data;
+ JabberStream *js = purple_connection_get_protocol_data(gc);
char *bare_jid = jabber_get_bare_jid(who);
if(bare_jid) {
@@ -1848,10 +1848,10 @@ static void jabber_buddy_make_invisible(
g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
buddy = (PurpleBuddy *) node;
- gc = purple_account_get_connection(buddy->account);
- js = gc->proto_data;
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ js = purple_connection_get_protocol_data(gc);
- jabber_buddy_set_invisibility(js, buddy->name, TRUE);
+ jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), TRUE);
}
static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data)
@@ -1863,10 +1863,10 @@ static void jabber_buddy_make_visible(Pu
g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
buddy = (PurpleBuddy *) node;
- gc = purple_account_get_connection(buddy->account);
- js = gc->proto_data;
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ js = purple_connection_get_protocol_data(gc);
- jabber_buddy_set_invisibility(js, buddy->name, FALSE);
+ jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), FALSE);
}
static void jabber_buddy_cancel_presence_notification(PurpleBlistNode *node,
@@ -1879,11 +1879,11 @@ static void jabber_buddy_cancel_presence
g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
buddy = (PurpleBuddy *) node;
- gc = purple_account_get_connection(buddy->account);
- js = gc->proto_data;
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ js = purple_connection_get_protocol_data(gc);
/* I wonder if we should prompt the user before doing this */
- jabber_presence_subscription_set(js, buddy->name, "unsubscribed");
+ jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribed");
}
static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data)
@@ -1895,10 +1895,10 @@ static void jabber_buddy_rerequest_auth(
g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
buddy = (PurpleBuddy *) node;
- gc = purple_account_get_connection(buddy->account);
- js = gc->proto_data;
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ js = purple_connection_get_protocol_data(gc);
- jabber_presence_subscription_set(js, buddy->name, "subscribe");
+ jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "subscribe");
}
@@ -1911,18 +1911,18 @@ static void jabber_buddy_unsubscribe(Pur
g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
buddy = (PurpleBuddy *) node;
- gc = purple_account_get_connection(buddy->account);
- js = gc->proto_data;
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ js = purple_connection_get_protocol_data(gc);
- jabber_presence_subscription_set(js, buddy->name, "unsubscribe");
+ jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribe");
}
static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) {
if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
/* simply create a directed presence of the current status */
PurpleBuddy *buddy = (PurpleBuddy *) node;
- PurpleConnection *gc = purple_account_get_connection(buddy->account);
- JabberStream *js = gc->proto_data;
+ PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ JabberStream *js = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
PurplePresence *gpresence = purple_account_get_presence(account);
PurpleStatus *status = purple_presence_get_active_status(gpresence);
@@ -1936,7 +1936,7 @@ static void jabber_buddy_login(PurpleBli
g_free(msg);
- xmlnode_set_attrib(presence, "to", buddy->name);
+ xmlnode_set_attrib(presence, "to", purple_buddy_get_name(buddy));
jabber_send(js, presence);
xmlnode_free(presence);
@@ -1947,12 +1947,13 @@ static void jabber_buddy_logout(PurpleBl
if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
/* simply create a directed unavailable presence */
PurpleBuddy *buddy = (PurpleBuddy *) node;
- JabberStream *js = purple_account_get_connection(buddy->account)->proto_data;
+ PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ JabberStream *js = purple_connection_get_protocol_data(gc);
xmlnode *presence;
presence = jabber_presence_create_js(js, JABBER_BUDDY_STATE_UNAVAILABLE, NULL, 0);
- xmlnode_set_attrib(presence, "to", buddy->name);
+ xmlnode_set_attrib(presence, "to", purple_buddy_get_name(buddy));
jabber_send(js, presence);
xmlnode_free(presence);
@@ -1961,9 +1962,10 @@ static GList *jabber_buddy_menu(PurpleBu
static GList *jabber_buddy_menu(PurpleBuddy *buddy)
{
- PurpleConnection *gc = purple_account_get_connection(buddy->account);
- JabberStream *js = gc->proto_data;
- JabberBuddy *jb = jabber_buddy_find(js, buddy->name, TRUE);
+ PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+ JabberStream *js = purple_connection_get_protocol_data(gc);
+ const char *name = purple_buddy_get_name(buddy);
+ JabberBuddy *jb = jabber_buddy_find(js, name, TRUE);
GList *jbrs;
GList *m = NULL;
@@ -2018,7 +2020,7 @@ static GList *jabber_buddy_menu(PurpleBu
* that gateways on the roster can be identified by having no '@' in their jid. This is a faily safe assumption, since
* people don't tend to have a server or other service there.
*/
- if (g_utf8_strchr(buddy->name, -1, '@') == NULL) {
+ if (g_utf8_strchr(name, -1, '@') == NULL) {
act = purple_menu_action_new(_("Log In"),
PURPLE_CALLBACK(jabber_buddy_login),
NULL, NULL);
@@ -2486,7 +2488,7 @@ void jabber_user_search_begin(PurplePlug
void jabber_user_search_begin(PurplePluginAction *action)
{
PurpleConnection *gc = (PurpleConnection *) action->context;
- JabberStream *js = gc->proto_data;
+ JabberStream *js = purple_connection_get_protocol_data(gc);
purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"),
_("Select a user directory to search"),
============================================================
--- libpurple/protocols/jabber/google.c f0624dcce3f7675f95224023738a5bc83d8f8fbb
+++ libpurple/protocols/jabber/google.c df5b015f852ba539adbcc477529969016c580236
@@ -309,7 +309,7 @@ void jabber_google_roster_add_deny(Purpl
g = purple_buddy_get_group(b);
group = xmlnode_new_child(item, "group");
- xmlnode_insert_data(group, g->name, -1);
+ xmlnode_insert_data(group, purple_group_get_name(g), -1);
buddies = buddies->next;
}
@@ -357,7 +357,7 @@ void jabber_google_roster_rem_deny(Purpl
if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
return;
- buddies = purple_find_buddies(js->gc->account, who);
+ buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
if(!buddies)
return;
@@ -375,7 +375,7 @@ void jabber_google_roster_rem_deny(Purpl
g = purple_buddy_get_group(b);
group = xmlnode_new_child(item, "group");
- xmlnode_insert_data(group, g->name, -1);
+ xmlnode_insert_data(group, purple_buddy_get_group(g), -1);
buddies = buddies->next;
}
More information about the Commits
mailing list