diff libpurple/protocols/jabber/chat.c @ 20892:bbcc9e206c43

propagate from branch 'im.pidgin.pidgin' (head f33ba0034c79d8e37a70d664ec534356fa361608) to branch 'im.pidgin.cpw.resiak.disconnectreason' (head b3c8182bd741b961775afed0768fbecdc47dc828)

--- a/libpurple/protocols/jabber/chat.c	Thu Oct 11 23:55:13 2007 +0000
+++ b/libpurple/protocols/jabber/chat.c	Fri Oct 12 00:19:12 2007 +0000
@@ -964,7 +964,7 @@
 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 @@
 	 * 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 @@
 	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)) {