cpw.darkrain42.xmpp.bosh: cd1ae9de: jabber_contact_info is no longer used

paul at darkrain42.org paul at darkrain42.org
Sat Jan 17 23:56:46 EST 2009


-----------------------------------------------------------------
Revision: cd1ae9de87cd7d5ca0f5e87a6d8b79bf561ebc5e
Ancestor: 81d5cbceff7fe1b7a2dd6c4de5202c5d92daacaf
Author: paul at darkrain42.org
Date: 2008-11-22T18:30:01
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/cd1ae9de87cd7d5ca0f5e87a6d8b79bf561ebc5e

Modified files:
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h

ChangeLog: 

jabber_contact_info is no longer used

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/caps.c	b1ea5502f7a92c647f224fdd8530a57cc7942b36
+++ libpurple/protocols/jabber/caps.c	1e97ca8fe8ffc636265d32300577ee1f274df6b7
@@ -540,8 +540,6 @@ void jabber_caps_get_info(JabberStream *
 	key->hash = g_strdup(hash);
 	
 	client = g_hash_table_lookup(capstable, key);
-
-	g_hash_table_replace(jabber_contact_info, g_strdup(who), key);
 	
 	if(!client) {
 		JabberIq *iq = jabber_iq_new_query(js,JABBER_IQ_GET,"http://jabber.org/protocol/disco#info");
============================================================
--- libpurple/protocols/jabber/jabber.c	c8ae91ead453eae539b3a6a64c7a64daecc47a7c
+++ libpurple/protocols/jabber/jabber.c	ede4dc9628128500c73535a543bab135c99b48c3
@@ -67,8 +67,6 @@ GList *jabber_identities = NULL;
 GList *jabber_features = NULL;
 GList *jabber_identities = NULL;
 
-GHashTable *jabber_contact_info = NULL;
-
 static void jabber_unregister_account_cb(JabberStream *js);
 static void try_srv_connect(JabberStream *js);
 
@@ -2625,8 +2623,6 @@ jabber_init_plugin(PurplePlugin *plugin)
 	jabber_add_feature("http://jabber.org/protocol/xhtml-im", 0);
 	jabber_add_feature("urn:xmpp:ping", 0);
 	
-	jabber_contact_info = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_caps_destroy_key);
-	
 	/* IPC functions */
 	purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),
 							 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,
============================================================
--- libpurple/protocols/jabber/jabber.h	1e5abb7e3b818d92a4fd0aa40af441b7a9fed82c
+++ libpurple/protocols/jabber/jabber.h	bdc4f5b6f89238381f7fdbda291655d576e50411
@@ -279,8 +279,6 @@ extern GList *jabber_identities;
 extern GList *jabber_features;
 extern GList *jabber_identities;
 
-extern GHashTable *jabber_contact_info; /* char * -> JabberCapsKey */
-
 void jabber_stream_features_parse(JabberStream *js, xmlnode *packet);
 void jabber_process_packet(JabberStream *js, xmlnode **packet);
 void jabber_send(JabberStream *js, xmlnode *data);


More information about the Commits mailing list