changeset 25906:716b14deee97

a few struct hiding clean ups
author Gary Kramlich <grim@reaperworld.com>
date Thu, 15 Jan 2009 22:46:15 +0000
parents 94a6eb10c691
children 3687049b4faf 8958393be615
files libpurple/plugins/statenotify.c libpurple/protocols/bonjour/jabber.c libpurple/protocols/qq/buddy_list.c
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/statenotify.c	Thu Jan 15 22:37:48 2009 +0000
+++ b/libpurple/plugins/statenotify.c	Thu Jan 15 22:46:15 2009 +0000
@@ -33,7 +33,7 @@
 	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);
--- a/libpurple/protocols/bonjour/jabber.c	Thu Jan 15 22:37:48 2009 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Thu Jan 15 22:46:15 2009 +0000
@@ -383,8 +383,9 @@
 
 	/* 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);
--- a/libpurple/protocols/qq/buddy_list.c	Thu Jan 15 22:37:48 2009 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Thu Jan 15 22:46:15 2009 +0000
@@ -232,7 +232,7 @@
 			/* 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 @@
 		/* 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;