libpurple/protocols/jabber/roster.c

branch
release-2.x.y
changeset 38091
be8d0f7d0041
parent 36022
256604cbbe34
child 38240
0552f69f1996
child 38256
035f00c4fd87
--- a/libpurple/protocols/jabber/roster.c	Wed Oct 05 15:53:43 2016 -0500
+++ b/libpurple/protocols/jabber/roster.c	Wed Oct 05 16:19:47 2016 -0500
@@ -27,7 +27,6 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "facebook_roster.h"
 #include "google/google.h"
 #include "google/google_roster.h"
 #include "presence.h"
@@ -212,18 +211,11 @@
 
 	js->currently_parsing_roster_push = TRUE;
 
-	if (js->server_caps & JABBER_CAP_FACEBOOK)
-		jabber_facebook_roster_cleanup(js, query);
-
 	for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item))
 	{
 		const char *jid, *name, *subscription, *ask;
 		JabberBuddy *jb;
 
-		if (js->server_caps & JABBER_CAP_FACEBOOK)
-			if (!jabber_facebook_roster_incoming(js, item))
-				continue;
-
 		subscription = xmlnode_get_attrib(item, "subscription");
 		jid = xmlnode_get_attrib(item, "jid");
 		name = xmlnode_get_attrib(item, "name");

mercurial