im.pidgin.pidgin.2.2.2: 6664bcbd0b8229766b68348d780da8bfc74b8130

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 6664bcbd0b8229766b68348d780da8bfc74b8130
Ancestor: 98b8aa96dfe4f472880a3b780c29e4a73a4550ee
Author: lschiere at pidgin.im
Date: 2007-10-19T18:28:33
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/roster.c

ChangeLog: 

applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
             through b219fc7a61d692d47953984814f7b4d882f20291

applied changes from b219fc7a61d692d47953984814f7b4d882f20291
             through f8476716fbd7f56dd6fe9fd371a8f5429b12d483

applied changes from f8476716fbd7f56dd6fe9fd371a8f5429b12d483
             through 2e96e2466f643bc1f895f5983c1c0ecb9730498c

applied changes from 2e96e2466f643bc1f895f5983c1c0ecb9730498c
             through 16d908d77101c3eb83632a6b9febef6d5ee96481

applied changes from 16d908d77101c3eb83632a6b9febef6d5ee96481
             through 9207c76719cf14838d6306432140b3f0da9225ae

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/chat.c	3ea3b18d924a1ede80610670e47ba7ee92d53bce
+++ libpurple/protocols/jabber/chat.c	4064b92a9c971329f3935eeea628882461922928
@@ -964,7 +964,7 @@ static void jabber_chat_disco_traffic_cb
 static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data)
 {
 	JabberChat *chat;
-	xmlnode *query;
+	/*xmlnode *query;*/
 	int id = GPOINTER_TO_INT(data);
 
 	if(!(chat = jabber_chat_find_by_id(js, id)))
@@ -974,6 +974,8 @@ static void jabber_chat_disco_traffic_cb
 	 * support this request */
 	chat->xhtml = TRUE;
 
+	/* disabling this until more MUC servers support
+	 * announcing this
 	if(xmlnode_get_child(packet, "error")) {
 		return;
 	}
@@ -981,8 +983,6 @@ static void jabber_chat_disco_traffic_cb
 	if(!(query = xmlnode_get_child(packet, "query")))
 		return;
 
-	/* disabling this until more MUC servers support
-	 * announcing this
 	chat->xhtml = FALSE;
 
 	for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) {
============================================================
--- libpurple/protocols/jabber/google.c	da699c80eadf16d9733542a67a873f0c6710845f
+++ libpurple/protocols/jabber/google.c	7c258895f25caf4624c3d48a780295cd3f831204
@@ -110,7 +110,7 @@ jabber_gmail_parse(JabberStream *js, xml
 		tos[i] = (to_name != NULL ?  to_name : "");
 		froms[i] = (from != NULL ?  from : "");
 		subjects[i] = (subject != NULL ? subject : g_strdup(""));
-		urls[i] = (url != NULL ? url : "");
+		urls[i] = url;
 
 		tid = xmlnode_get_attrib(message, "tid");
 		if (tid &&
============================================================
--- libpurple/protocols/jabber/iq.c	ed82367f4b09476e9a481c05553b18b4dac2f9e5
+++ libpurple/protocols/jabber/iq.c	4d6e6f759f6124928998742da165598f635f713d
@@ -248,7 +248,6 @@ static void jabber_iq_version_parse(Jabb
 	JabberIq *iq;
 	const char *type, *from, *id;
 	xmlnode *query;
-	char *os = NULL;
 
 	type = xmlnode_get_attrib(packet, "type");
 
@@ -256,6 +255,7 @@ static void jabber_iq_version_parse(Jabb
 		GHashTable *ui_info;
 		const char *ui_name = NULL, *ui_version = NULL;
 #if 0
+		char *os = NULL;
 		if(!purple_prefs_get_bool("/plugins/prpl/jabber/hide_os")) {
 			struct utsname osinfo;
 
@@ -290,10 +290,12 @@ static void jabber_iq_version_parse(Jabb
 			xmlnode_insert_data(xmlnode_new_child(query, "version"), VERSION, -1);
 		}
 
+#if 0
 		if(os) {
 			xmlnode_insert_data(xmlnode_new_child(query, "os"), os, -1);
 			g_free(os);
 		}
+#endif
 
 		jabber_iq_send(iq);
 	}
============================================================
--- libpurple/protocols/jabber/jabber.c	9566f6a2fd23699865c6a8ba16b2315d3daa3153
+++ libpurple/protocols/jabber/jabber.c	56936b5797745d7a4b45f997c27ec200c1764a6b
@@ -1914,7 +1914,7 @@ char *jabber_parse_error(JabberStream *j
 			text = _("Authentication Failure");
 		}
 	} else if(!strcmp(packet->name, "stream:error") ||
-			 (!strcmp(packet->name, "error") &&
+			 (!strcmp(packet->name, "error") && xmlns &&
 				!strcmp(xmlns, "http://etherx.jabber.org/streams"))) {
 		if(xmlnode_get_child(packet, "bad-format")) {
 			text = _("Bad Format");
============================================================
--- libpurple/protocols/jabber/roster.c	deb365dab00fc7f261eda9ac73b9309c1af0b8a6
+++ libpurple/protocols/jabber/roster.c	f9eb1e8c18fbec6fbbae94a91fb88d6b7f647216
@@ -403,12 +403,12 @@ void jabber_roster_remove_buddy(PurpleCo
 void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 		PurpleGroup *group) {
 	GSList *buddies = purple_find_buddies(gc->account, buddy->name);
-	GSList *groups = NULL;
 
 	buddies = g_slist_remove(buddies, buddy);
 	if(buddies != NULL) {
 		PurpleBuddy *tmpbuddy;
 		PurpleGroup *tmpgroup;
+		GSList *groups = NULL;
 
 		while(buddies) {
 			tmpbuddy = buddies->data;
@@ -418,6 +418,7 @@ void jabber_roster_remove_buddy(PurpleCo
 		}
 
 		jabber_roster_update(gc->proto_data, buddy->name, groups);
+		g_slist_free(groups);
 	} else {
 		JabberIq *iq = jabber_iq_new_query(gc->proto_data, JABBER_IQ_SET,
 				"jabber:iq:roster");
@@ -429,9 +430,4 @@ void jabber_roster_remove_buddy(PurpleCo
 
 		jabber_iq_send(iq);
 	}
-
-	if(buddies)
-		g_slist_free(buddies);
-	if(groups)
-		g_slist_free(groups);
 }