summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Atallah <datallah@pidgin.im>2007-10-09 22:39:44 +0000
committerDaniel Atallah <datallah@pidgin.im>2007-10-09 22:39:44 +0000
commit0ed6ebc662e822feedef340c1d5baa1d1306919d (patch)
tree808fec4272a862e473fe12a01b7197cce55ca08a
parenteb12bcfd0b615a74180bbef2f9d42b3351e532ba (diff)
downloadpidgin-0ed6ebc662e822feedef340c1d5baa1d1306919d.tar.gz
Fully comment out some disabled code to prevent CID 180.
-rw-r--r--libpurple/protocols/jabber/chat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index 0b1a20b469..2e6617309c 100644
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -964,7 +964,7 @@ gboolean jabber_chat_kick_user(JabberChat *chat, const char *who, const char *wh
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(JabberStream *js, xmlnode *packet, gpoi
* 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(JabberStream *js, xmlnode *packet, gpoi
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)) {