adium.1-4: 80bd6eaa: Plucked 4bb0587b181457c9971826f9a448bdbc...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 80bd6eaaaeb27b69d18a50c8cf77b990c407a62e
Parent:   ad5842c18a1df74e7cc6849fcdf945eed83a8cd2
Author:   evands at pidgin.im
Date:     09/19/10 17:44:14
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/80bd6eaaaeb27b69d18a50c8cf77b990c407a62e

Changelog: 

Plucked 4bb0587b181457c9971826f9a448bdbcdab4a9cf: Expire the caps_hash if the features or identities change for a JabberStream

Changes against parent ad5842c18a1df74e7cc6849fcdf945eed83a8cd2

  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	4a5b75caa1682742700e182ad5a68fff4fed172c
+++ libpurple/protocols/jabber/jabber.c	9acc6dce8bb6e3ea1d00e920789e99518b957b2e
@@ -1823,6 +1823,10 @@ void jabber_add_feature(const char *name
 	jabber_remove_feature(namespace);
 
 	jabber_features = g_list_append(jabber_features, feat);
+
+   /* Our cached caps_hash, if present, is now incorrect; force recalculation next time it is needed */
+	g_free(js->caps_hash);
+	js->caps_hash = NULL;	
 }
 
 void jabber_remove_feature(const char *namespace) {
@@ -1870,6 +1874,10 @@ void jabber_add_identity(const gchar *ca
 	ident->lang = g_strdup(lang);
 	ident->name = g_strdup(name);
 	jabber_identities = g_list_prepend(jabber_identities, ident);
+	
+    /* Our cached caps_hash, if present, is now incorrect; force recalculation next time it is needed */
+	g_free(js->caps_hash);
+	js->caps_hash = NULL;	
 }
 
 static void jabber_identities_destroy(void)