diff libpurple/protocols/jabber/iq.c @ 26416:6f0200f1e497

Clean up usage of USE_VV in the XMPP protocol.

--- a/libpurple/protocols/jabber/iq.c	Sat Mar 21 07:53:22 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Sat Mar 21 09:07:06 2009 +0000
@@ -372,11 +372,13 @@
 			return;
 		}
 	}
-	
+
+#ifdef USE_VV
 	if (xmlnode_get_child_with_namespace(packet, "session", "http://www.google.com/session")) {
 		jabber_google_session_parse(js, packet);
 		return;
 	}
+#endif
 
 	if(xmlnode_get_child_with_namespace(packet, "si", "http://jabber.org/protocol/si")) {
 		jabber_si_parse(js, packet);
@@ -406,13 +408,11 @@
 		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")) {
@@ -453,9 +453,8 @@
 	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);