pidgin.next.minor: 4f8748fa: a few struct hiding clean ups

grim at pidgin.im grim at pidgin.im
Thu Jan 15 17:53:55 EST 2009


-----------------------------------------------------------------
Revision: 4f8748faa3551f9475017bfe39dd11ff5e560cf0
Ancestor: fb4eddb0c91aa5147d5e4270a06fc4a7f051e844
Author: grim at pidgin.im
Date: 2009-01-15T22:46:15
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/4f8748faa3551f9475017bfe39dd11ff5e560cf0

Modified files:
        libpurple/plugins/statenotify.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/qq/buddy_list.c

ChangeLog: 

a few struct hiding clean ups


-------------- next part --------------
============================================================
--- libpurple/plugins/statenotify.c	2d008e7e0664234da55fbf781793cbb1d9be6554
+++ libpurple/plugins/statenotify.c	574bd5374fad8bba4dbb585646da391f3d78b422
@@ -33,7 +33,7 @@ write_status(PurpleBuddy *buddy, const c
 	g_return_if_fail(conv->type == PURPLE_CONV_TYPE_IM);
 
 	/* Prevent duplicate notifications for buddies in multiple groups */
-	if (buddy != purple_find_buddy(buddy->account, buddy->name))
+	if (buddy != purple_find_buddy(account, buddy_name))
 		return;
 
 	who = purple_buddy_get_alias(buddy);
============================================================
--- libpurple/protocols/bonjour/jabber.c	11fef66466f49e3308dc0df4ec61673f41fab3e3
+++ libpurple/protocols/bonjour/jabber.c	f46786283dd086774a3d66b6915bb5b617fc4389
@@ -383,8 +383,9 @@ static void bonjour_jabber_stream_ended(
 
 	/* Inform the user that the conversation has been closed */
 	BonjourBuddy *bb = NULL;
+	const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)";
 
-	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", bconv->pb ? bconv->pb->name : "(unknown)");
+	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name);
 
 	if(bconv->pb != NULL)
 		bb = purple_buddy_get_protocol_data(bconv->pb);
============================================================
--- libpurple/protocols/qq/buddy_list.c	3f1ba6589674e3dcf1862ff4c1fa665c9d5b2d12
+++ libpurple/protocols/qq/buddy_list.c	4c1932d9a2c3cb54c386c97d181706d957ec51c1
@@ -232,7 +232,7 @@ guint8 qq_process_get_buddies_online(gui
 			/* create no-auth buddy */
 			buddy = qq_buddy_new(gc, bs.uid);
 		}
-		bd = (buddy == NULL) ? NULL : (qq_buddy_data *)buddy->proto_data;
+		bd = (buddy == NULL) ? NULL : (qq_buddy_data *)purple_buddy_get_protocol_data(buddy);
 		if (bd == NULL) {
 			purple_debug_error("QQ",
 					"Got an online buddy %u, but not in my buddy list\n", bs.uid);
@@ -567,7 +567,7 @@ void qq_process_buddy_change_status(guin
 		/* create no-auth buddy */
 		buddy = qq_buddy_new(gc, bs.uid);
 	}
-	bd = (buddy == NULL) ? NULL : (qq_buddy_data *) buddy->proto_data;
+	bd = (buddy == NULL) ? NULL : (qq_buddy_data *)purple_buddy_get_protocol_data(buddy);
 	if (bd == NULL) {
 		purple_debug_warning("QQ", "Got status of no-auth buddy %u\n", bs.uid);
 		return;


More information about the Commits mailing list