Mercurial > pidgin
diff libpurple/protocols/jabber/iq.c @ 24938:bd598b606ca4
Restructure Jingle code to more easily support multiple application types.
Actually negotiate a rawudp transport rather than pretending to use iceudp.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:37:23 +0000 |
| parents | 517062503b48 |
| children | 8bfa1f01f035 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/iq.c Fri Sep 05 02:18:15 2008 +0000 +++ b/libpurple/protocols/jabber/iq.c Sun Oct 19 04:37:23 2008 +0000 @@ -28,7 +28,7 @@ #include "disco.h" #include "google.h" #include "iq.h" -#include "jingle.h" +#include "jingle/jingle.h" #include "oob.h" #include "roster.h" #include "si.h" @@ -360,8 +360,8 @@ } #ifdef USE_VV - if (xmlnode_get_child_with_namespace(packet, "jingle", "urn:xmpp:tmp:jingle")) { - jabber_jingle_session_parse(js, packet); + if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) { + jingle_parse(js, packet); return; } #endif @@ -406,7 +406,7 @@ 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("urn:xmpp:tmp:jingle", jabber_jingle_session_parse); + jabber_iq_register_handler(JINGLE, jingle_parse); #endif }