im.pidgin.pidgin: 2e96e2466f643bc1f895f5983c1c0ecb9730498c

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 2e96e2466f643bc1f895f5983c1c0ecb9730498c
Ancestor: f8476716fbd7f56dd6fe9fd371a8f5429b12d483
Author: datallah at pidgin.im
Date: 2007-10-09T22:39:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/chat.c

ChangeLog: 

Fully comment out some disabled code to prevent CID 180.

-------------- 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)) {