Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/oscar/oscar.c	Wed Jul 03 22:13:33 2013 +0530
+++ b/libpurple/protocols/oscar/oscar.c	Wed Jul 03 22:18:55 2013 +0530
@@ -3743,7 +3743,7 @@
 
 			/* Make a list of what the groups each buddy is in */
 			for (cur = moved_buddies; cur != NULL; cur = cur->next) {
-				PurpleBlistNode *node = cur->data;
+				PurpleBListNode *node = cur->data;
 				/* node is PurpleBuddy, parent is a PurpleContact.
 				 * We must go two levels up to get the Group */
 				groups = g_list_append(groups,
@@ -3885,7 +3885,7 @@
 
 		if (aim_ssi_itemlist_exists(&od->ssi.local, bname)) {
 			/* If the buddy is an ICQ user then load his nickname */
-			const char *servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick");
+			const char *servernick = purple_blist_node_get_string((PurpleBListNode*)b, "servernick");
 			char *alias;
 			const char *balias;
 			if (servernick)
@@ -4856,7 +4856,7 @@
 	oscar_free_name_data(data);
 }
 
-static void oscar_buddycb_edit_comment(PurpleBlistNode *node, gpointer ignore) {
+static void oscar_buddycb_edit_comment(PurpleBListNode *node, gpointer ignore) {
 
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4921,7 +4921,7 @@
 static void
 oscar_ask_directim(gpointer object, gpointer ignored)
 {
-	PurpleBlistNode *node;
+	PurpleBListNode *node;
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 	gchar *buf;
@@ -4957,7 +4957,7 @@
 static void
 oscar_close_directim(gpointer object, gpointer ignored)
 {
-	PurpleBlistNode *node;
+	PurpleBListNode *node;
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
 	PurpleConnection *gc;
@@ -4992,7 +4992,7 @@
 	}
 }
 
-static void oscar_get_icqxstatusmsg(PurpleBlistNode *node, gpointer ignore)
+static void oscar_get_icqxstatusmsg(PurpleBListNode *node, gpointer ignore)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -5015,7 +5015,7 @@
 }
 
 static void
-oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
+oscar_get_aim_info_cb(PurpleBListNode *node, gpointer ignore)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -5119,7 +5119,7 @@
 }
 
 
-GList *oscar_blist_node_menu(PurpleBlistNode *node) {
+GList *oscar_blist_node_menu(PurpleBListNode *node) {
 	if(PURPLE_IS_BUDDY(node)) {
 		return oscar_buddy_menu((PurpleBuddy *) node);
 	} else {