diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-04-05 19:25:45 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-04-05 19:25:45 +0000 |
| commit | 638348b044862f81cff746e8c6254059faf38a72 (patch) | |
| tree | 7e1444caa0f12daaa7bee352c0089514b8261c1e | |
| parent | adf60a7d5356e66584148c253404d13d012aab34 (diff) | |
| download | pidgin-cpw.darkrain42.xmpp.iq-handlers.tar.gz | |
Gratuitous alphabetization of the IQ handlers (again!) and move the data handler to jabber_data_initcpw.darkrain42.xmpp.iq-handlers
| -rw-r--r-- | libpurple/protocols/jabber/data.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/iq.c | 37 |
2 files changed, 24 insertions, 15 deletions
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c index bddafb18f9..562794dc18 100644 --- a/libpurple/protocols/jabber/data.c +++ b/libpurple/protocols/jabber/data.c @@ -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 diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c index 872bc10c04..33d194b78b 100644 --- a/libpurple/protocols/jabber/iq.c +++ b/libpurple/protocols/jabber/iq.c @@ -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) |