Mercurial > pidgin
diff libpurple/protocols/jabber/iq.c @ 24944:8bfa1f01f035
merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06'
and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:40:59 +0000 |
| parents | bd598b606ca4 4d752d07a126 |
| children | bcad7dc4b453 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/iq.c Sun Oct 19 04:37:23 2008 +0000 +++ b/libpurple/protocols/jabber/iq.c Sun Oct 19 04:40:59 2008 +0000 @@ -34,6 +34,7 @@ #include "si.h" #include "ping.h" #include "adhoccommands.h" +#include "data.h" #ifdef _WIN32 #include "utsname.h" @@ -314,7 +315,7 @@ const char *xmlns; const char *type, *id, *from; JabberIqHandler *jih; - + query = xmlnode_get_child(packet, "query"); type = xmlnode_get_attrib(packet, "type"); from = xmlnode_get_attrib(packet, "from"); @@ -354,10 +355,17 @@ return; } + purple_debug_info("jabber", "jabber_iq_parse\n"); + if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) { jabber_ping_parse(js, packet); return; } + + if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) { + jabber_data_parse(js, packet); + return; + } #ifdef USE_VV if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) {