Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/iq.c @ 26213:ff4212a5268f
propagate from branch 'im.pidgin.pidgin' (head 431618de0f30a6938f7e14d2d61ee5d7738acd59)
to branch 'im.pidgin.pidgin.vv' (head 8df00cb1a28baa69d0a68e0e96af201ec7d87c09)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 18:47:27 +0000 |
| parents | 5f9a24d1c25e 88f183f7dfc7 |
| children | 6f0200f1e497 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/iq.c Mon Mar 02 16:34:05 2009 +0000 +++ b/libpurple/protocols/jabber/iq.c Mon Mar 02 18:47:27 2009 +0000 @@ -28,6 +28,7 @@ #include "disco.h" #include "google.h" #include "iq.h" +#include "jingle/jingle.h" #include "oob.h" #include "roster.h" #include "si.h" @@ -371,6 +372,11 @@ return; } } + + if (xmlnode_get_child_with_namespace(packet, "session", "http://www.google.com/session")) { + jabber_google_session_parse(js, packet); + return; + } if(xmlnode_get_child_with_namespace(packet, "si", "http://jabber.org/protocol/si")) { jabber_si_parse(js, packet); @@ -400,6 +406,13 @@ jabber_ibb_parse(js, packet); return; } + +#ifdef USE_VV + if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) { + jingle_parse(js, packet); + return; + } +#endif /* If we get here, send the default error reply mandated by XMPP-CORE */ if(!strcmp(type, "set") || !strcmp(type, "get")) { @@ -440,6 +453,12 @@ jabber_iq_register_handler("http://jabber.org/protocol/disco#items", jabber_disco_items_parse); jabber_iq_register_handler("jabber:iq:register", jabber_register_parse); jabber_iq_register_handler("urn:xmpp:ping", urn_xmpp_ping_parse); +#ifdef USE_VV + jabber_iq_register_handler(JINGLE, jingle_parse); +#endif + /* handle Google jingleinfo */ + jabber_iq_register_handler(GOOGLE_JINGLE_INFO_NAMESPACE, + jabber_google_handle_jingle_info); } void jabber_iq_uninit(void)