# HG changeset patch # User Paul Aurich # Date 1238958859 0 # Node ID 4dc4d0aa25f58c02151d73b80333bea9f8572d3a # Parent 36c435f552525a1f4a9eaa2bbc1777a6a8cd03a7 Move some IQ handler registrations to the appropriate init functions diff -r 36c435f55252 -r 4dc4d0aa25f5 libpurple/protocols/jabber/ibb.c --- a/libpurple/protocols/jabber/ibb.c Sun Apr 05 19:05:49 2009 +0000 +++ b/libpurple/protocols/jabber/ibb.c Sun Apr 05 19:14:19 2009 +0000 @@ -502,6 +502,10 @@ jabber_ibb_init(void) { jabber_ibb_sessions = g_hash_table_new(g_str_hash, g_str_equal); + + jabber_iq_register_handler("close", XEP_0047_NAMESPACE, jabber_ibb_parse); + jabber_iq_register_handler("data", XEP_0047_NAMESPACE, jabber_ibb_parse); + jabber_iq_register_handler("open", XEP_0047_NAMESPACE, jabber_ibb_parse); } void diff -r 36c435f55252 -r 4dc4d0aa25f5 libpurple/protocols/jabber/iq.c --- a/libpurple/protocols/jabber/iq.c Sun Apr 05 19:05:49 2009 +0000 +++ b/libpurple/protocols/jabber/iq.c Sun Apr 05 19:14:19 2009 +0000 @@ -417,7 +417,6 @@ jabber_iq_register_handler("query", "http://jabber.org/protocol/bytestreams", jabber_bytestreams_parse); jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#info", jabber_disco_info_parse); jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#items", jabber_disco_items_parse); - jabber_iq_register_handler("si", "http://jabber.org/protocol/si", jabber_si_parse); jabber_iq_register_handler("query", "jabber:iq:last", jabber_iq_last_parse); jabber_iq_register_handler("query", "jabber:iq:oob", jabber_oob_parse); jabber_iq_register_handler("query", "jabber:iq:register", jabber_register_parse); @@ -428,10 +427,6 @@ jabber_iq_register_handler("ping", "urn:xmpp:ping", jabber_ping_parse); jabber_iq_register_handler("time", "urn:xmpp:time", jabber_iq_time_parse); - jabber_iq_register_handler("data", XEP_0047_NAMESPACE, jabber_ibb_parse); - jabber_iq_register_handler("close", XEP_0047_NAMESPACE, jabber_ibb_parse); - jabber_iq_register_handler("open", XEP_0047_NAMESPACE, jabber_ibb_parse); - jabber_iq_register_handler("jingle", JINGLE, jingle_parse); jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE, jabber_google_handle_jingle_info); diff -r 36c435f55252 -r 4dc4d0aa25f5 libpurple/protocols/jabber/si.c --- a/libpurple/protocols/jabber/si.c Sun Apr 05 19:05:49 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Sun Apr 05 19:14:19 2009 +0000 @@ -1677,6 +1677,8 @@ void jabber_si_init(void) { + jabber_iq_register_handler("si", "http://jabber.org/protocol/si", jabber_si_parse); + jabber_ibb_register_open_handler(jabber_si_xfer_ibb_open_cb); }