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

Clean up usage of USE_VV in the XMPP protocol.

26415:4143990b5c09

		if((jih = g_hash_table_lookup(iq_handlers, xmlns))) {
			jih(js, packet);
			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);
		return;
	}

		|| xmlnode_get_child_with_namespace(packet, "close", XEP_0047_NAMESPACE)
		|| xmlnode_get_child_with_namespace(packet, "open", XEP_0047_NAMESPACE)) {
		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")) {
		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);

	jabber_iq_register_handler("jabber:iq:version", jabber_iq_version_parse);
	jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse);
	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);
}

26416:6f0200f1e497

		if((jih = g_hash_table_lookup(iq_handlers, xmlns))) {
			jih(js, packet);
			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);
		return;
	}

		|| xmlnode_get_child_with_namespace(packet, "close", XEP_0047_NAMESPACE)
		|| xmlnode_get_child_with_namespace(packet, "open", XEP_0047_NAMESPACE)) {
		jabber_ibb_parse(js, packet);
		return;
	}

	if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) {
		jingle_parse(js, packet);
		return;
	}

	/* If we get here, send the default error reply mandated by XMPP-CORE */
	if(!strcmp(type, "set") || !strcmp(type, "get")) {
		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);

	jabber_iq_register_handler("jabber:iq:version", jabber_iq_version_parse);
	jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse);
	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);
	jabber_iq_register_handler(JINGLE, jingle_parse);

	/* handle Google jingleinfo */
	jabber_iq_register_handler(GOOGLE_JINGLE_INFO_NAMESPACE, 
		jabber_google_handle_jingle_info);
}