Mercurial > pidgin
comparison libpurple/protocols/jabber/chat.c @ 20892:bbcc9e206c43
propagate from branch 'im.pidgin.pidgin' (head f33ba0034c79d8e37a70d664ec534356fa361608)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head b3c8182bd741b961775afed0768fbecdc47dc828)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 12 Oct 2007 00:19:12 +0000 |
| parents | bde477ec6a71 01db16265553 |
| children | e747ac0c42d6 |
comparison
equal
deleted
inserted
replaced
| 20823:f33ed41b6dee | 20892:bbcc9e206c43 |
|---|---|
| 962 } | 962 } |
| 963 | 963 |
| 964 static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data) | 964 static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data) |
| 965 { | 965 { |
| 966 JabberChat *chat; | 966 JabberChat *chat; |
| 967 xmlnode *query; | 967 /*xmlnode *query;*/ |
| 968 int id = GPOINTER_TO_INT(data); | 968 int id = GPOINTER_TO_INT(data); |
| 969 | 969 |
| 970 if(!(chat = jabber_chat_find_by_id(js, id))) | 970 if(!(chat = jabber_chat_find_by_id(js, id))) |
| 971 return; | 971 return; |
| 972 | 972 |
| 973 /* defaults, in case the conference server doesn't | 973 /* defaults, in case the conference server doesn't |
| 974 * support this request */ | 974 * support this request */ |
| 975 chat->xhtml = TRUE; | 975 chat->xhtml = TRUE; |
| 976 | 976 |
| 977 if(xmlnode_get_child(packet, "error")) { | |
| 978 return; | |
| 979 } | |
| 980 | |
| 981 if(!(query = xmlnode_get_child(packet, "query"))) | |
| 982 return; | |
| 983 | |
| 984 /* disabling this until more MUC servers support | 977 /* disabling this until more MUC servers support |
| 985 * announcing this | 978 * announcing this |
| 979 if(xmlnode_get_child(packet, "error")) { | |
| 980 return; | |
| 981 } | |
| 982 | |
| 983 if(!(query = xmlnode_get_child(packet, "query"))) | |
| 984 return; | |
| 985 | |
| 986 chat->xhtml = FALSE; | 986 chat->xhtml = FALSE; |
| 987 | 987 |
| 988 for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) { | 988 for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) { |
| 989 const char *var = xmlnode_get_attrib(x, "var"); | 989 const char *var = xmlnode_get_attrib(x, "var"); |
| 990 | 990 |