cpw.darkrain42.xmpp.iq-handlers: 91088097: Move some IQ handler registrations to th...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 91088097a64ce50eb5a82797dff3c5d087000edc
Ancestor: 8baab3f2fe55a6921be5c56704bd08ca481c7432
Author: paul at darkrain42.org
Date: 2009-04-05T19:14:19
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/91088097a64ce50eb5a82797dff3c5d087000edc

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

ChangeLog: 

Move some IQ handler registrations to the appropriate init functions

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/ibb.c	f975b3ca8f7c1e2f2fdb9c7b64e646904e85211b
+++ libpurple/protocols/jabber/ibb.c	9561150e4111478d80108b5979d5f02c249b89a7
@@ -502,6 +502,10 @@ jabber_ibb_init(void)
 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
============================================================
--- libpurple/protocols/jabber/iq.c	bd0b758ec7b536162bf210fcb15713aee5e24b32
+++ libpurple/protocols/jabber/iq.c	738fb995f0931d580a6a089af0b04d74dcfc7829
@@ -417,7 +417,6 @@ void jabber_iq_init(void)
 	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 @@ void jabber_iq_init(void)
 	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);
============================================================
--- libpurple/protocols/jabber/si.c	1c1df0ad838327bfe6c119ff43667c7d59f7b093
+++ libpurple/protocols/jabber/si.c	ef0c7282cdb768462e3414dee4c3797ff3a8c62c
@@ -1677,6 +1677,8 @@ jabber_si_init(void)
 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);
 }