/pidgin/main: 5a0231b9b25b: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: 5a0231b9b25b8d42ee9182c922a78aaaf359ee90
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-07 17:14 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/5a0231b9b25b

Description:

Merge release-2.x.y

diffstat:

 ChangeLog                                    |  3 +++
 libpurple/protocols/jabber/facebook_roster.c |  4 ++++
 libpurple/protocols/jabber/jabber.h          |  3 +++
 3 files changed, 10 insertions(+), 0 deletions(-)

diffs (40 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,9 @@ version 2.10.10 (?/?/?):
 	* Fix a possible leak of unencrypted data when using /me command
 	  with OTR. (Thijs Alkemade) (#15750)
 
+	XMPP:
+	* Fix Facebook XMPP roster quirks. (#15041, #15957)
+
 version 2.10.9 (2/2/2014):
 	XMPP:
 	* Fix problems logging into some servers including jabber.org and
diff --git a/libpurple/protocols/jabber/facebook_roster.c b/libpurple/protocols/jabber/facebook_roster.c
--- a/libpurple/protocols/jabber/facebook_roster.c
+++ b/libpurple/protocols/jabber/facebook_roster.c
@@ -35,6 +35,10 @@ jabber_facebook_roster_cleanup(JabberStr
 	PurpleBuddy *buddy;
 	const gchar *jid;
 
+	if (js->facebook_roster_cleanup_performed)
+		return;
+	js->facebook_roster_cleanup_performed = TRUE;
+
 	/* mark all local buddies as "to be removed" */
 	remove_buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
 		g_free, NULL);
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -280,6 +280,9 @@ struct _JabberStream
 	/* stuff for Google's relay handling */
 	gchar *google_relay_token;
 	gchar *google_relay_host;
+
+	/* facebook quirks */
+	gboolean facebook_roster_cleanup_performed;
 };
 
 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);