pidgin.next.minor: 8b4989e6: Fix up the propagate from im.pidgin.pidg...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 8b4989e60a7e5c10a6ef730ccfc15b3a732c31b3
Ancestor: c0596d9074e8c6db345424cf53009b1f2ab35ff9
Author: rlaager at pidgin.im
Date: 2008-12-12T20:24:24
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/8b4989e60a7e5c10a6ef730ccfc15b3a732c31b3

Modified files:
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/msn.c

ChangeLog: 

Fix up the propagate from im.pidgin.pidgin

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/jabber.c	a3c7f926c4f30610396693bf3c4aed485607d516
+++ libpurple/protocols/bonjour/jabber.c	2bd4274705ce7ab534d88d1c9467506e9922531d
@@ -379,7 +379,24 @@ void bonjour_jabber_process_packet(Purpl
 		purple_debug_warning("bonjour", "Unknown packet: %s\n", packet->name ? packet->name : "(null)");
 }
 
+static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) {
+	const gchar *name = NULL;
+	BonjourBuddy *bb = NULL;
 
+	if(bconv->pb != NULL) {
+		name = purple_buddy_get_name(bconv->pb);
+		bb = purple_buddy_get_protocol_data(bconv->pb);
+	}
+
+	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)");
+
+	/* Close the socket, clear the watcher and free memory */
+	bonjour_jabber_close_conversation(bconv);
+
+	if(bb)
+		bb->conversation = NULL;
+}
+
 static void
 _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition)
 {
@@ -427,24 +444,6 @@ _client_socket_handler(gpointer data, gi
 	bonjour_parser_process(bconv, message, message_length);
 }
 
-static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) {
-	const gchar *name = NULL;
-	BonjourBuddy *bb = NULL;
-
-	if(bconv->pb != NULL) {
-		name = purple_buddy_get_name(bconv->pb);
-		bb = purple_buddy_get_protocol_data(bconv->pb);
-	}
-
-	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)");
-
-	/* Close the socket, clear the watcher and free memory */
-	bonjour_jabber_close_conversation(bconv);
-
-	if(bb)
-		bb->conversation = NULL;
-}
-
 struct _stream_start_data {
 	char *msg;
 };
============================================================
--- libpurple/protocols/msn/msn.c	70d586ec34c053daf3e1422f5780c7ecefd54cb9
+++ libpurple/protocols/msn/msn.c	c56654684daecf3d77f3322f095bb767de1d7ea2
@@ -1459,7 +1459,7 @@ msn_add_buddy(PurpleConnection *gc, Purp
 		msn_userlist_add_buddy(userlist, who, gname);
 	} else {
 		/* We need to check the network for this buddy first */
-		msn_userlist_save_pending_buddy(userlist, who, gname : NULL);
+		msn_userlist_save_pending_buddy(userlist, who, gname);
 		msn_notification_send_fqy(session, who);
 	}
 }