cpw.darkrain42.xmpp.iq-handlers: 0799a27c: Gratuitous alphabetization of the IQ han...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 0799a27c10407559c5289c971bedee02a60d701a
Ancestor: 8a9c0c26ae6432af9cf6ba478bfb09dd0e377de8
Author: paul at darkrain42.org
Date: 2009-04-05T19:25:45
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/0799a27c10407559c5289c971bedee02a60d701a

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

ChangeLog: 

Gratuitous alphabetization of the IQ handlers (again!) and move the data handler to jabber_data_init

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c	0eea92403b3b04fbc1eb90e4bfa0d0a7da659d88
+++ libpurple/protocols/jabber/data.c	1390e0e869f8b52de036944882e3b23b235a105d
@@ -236,6 +236,8 @@ jabber_data_init(void)
 		g_free, jabber_data_delete);
 	remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
 		g_free, jabber_data_delete);
+
+	jabber_iq_register_handler("data", XEP_0231_NAMESPACE, jabber_data_parse);	
 }
 
 void
============================================================
--- libpurple/protocols/jabber/iq.c	738fb995f0931d580a6a089af0b04d74dcfc7829
+++ libpurple/protocols/jabber/iq.c	188f86d9ec085cba428cfbdc1c99964ac45656b1
@@ -412,28 +412,35 @@ void jabber_iq_init(void)
 {
 	iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-	jabber_iq_register_handler("mailbox", "google:mail:notify", jabber_gmail_poke);
-	jabber_iq_register_handler("new-mail", "google:mail:notify", jabber_gmail_poke);
-	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("jingle", JINGLE, jingle_parse);
+	jabber_iq_register_handler("mailbox", "google:mail:notify",
+			jabber_gmail_poke);
+	jabber_iq_register_handler("new-mail", "google:mail:notify",
+			jabber_gmail_poke);
+	jabber_iq_register_handler("ping", "urn:xmpp:ping", jabber_ping_parse);
+	jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE,
+			jabber_google_handle_jingle_info);
+	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("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);
-	jabber_iq_register_handler("query", "jabber:iq:roster", jabber_roster_parse);
+	jabber_iq_register_handler("query", "jabber:iq:register",
+			jabber_register_parse);
+	jabber_iq_register_handler("query", "jabber:iq:roster",
+			jabber_roster_parse);
 	jabber_iq_register_handler("query", "jabber:iq:time", jabber_iq_time_parse);
-	jabber_iq_register_handler("query", "jabber:iq:version", jabber_iq_version_parse);
-	jabber_iq_register_handler("data", XEP_0231_NAMESPACE, jabber_data_parse);
-	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("jingle", JINGLE, jingle_parse);
-	jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE,
-		jabber_google_handle_jingle_info);
+	jabber_iq_register_handler("query", "jabber:iq:version",
+			jabber_iq_version_parse);
 #ifdef USE_VV
 	jabber_iq_register_handler("session", "http://www.google.com/session",
 		jabber_google_session_parse);
 #endif
+	jabber_iq_register_handler("time", "urn:xmpp:time", jabber_iq_time_parse);
+
 }
 
 void jabber_iq_uninit(void)