cpw.darkrain42.xmpp.iq-handlers: b81f5132: Fix-up the merge some more (*sigh*), rea...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: b81f51329b7872daf2d99302e23d6b2f98d9c342
Ancestor: a93458daf939871b61b046659e063429b59b8270
Author: paul at darkrain42.org
Date: 2009-04-04T07:51:13
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/b81f51329b7872daf2d99302e23d6b2f98d9c342

Modified files:
        libpurple/protocols/jabber/iq.c

ChangeLog: 

Fix-up the merge some more (*sigh*), readding <session/> handler

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/iq.c	155242ede2fa4b69fb86367b33e6bb604c297e5c
+++ libpurple/protocols/jabber/iq.c	bd0b758ec7b536162bf210fcb15713aee5e24b32
@@ -435,6 +435,10 @@ void jabber_iq_init(void)
 	jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
 	jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE,
 		jabber_google_handle_jingle_info);
+#ifdef USE_VV
+	jabber_iq_register_handler("session", "http://www.google.com/session",
+		jabber_google_session_parse);
+#endif
 }
 
 void jabber_iq_uninit(void)