# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1254766208 0
# Node ID 5c61429ea5299b2c51b84f8b5c28365e21be7ac9
# Parent  f7d7cf32a7150aa421e5a61ecbc8ea35f5641f5c
jabber: Fix removing a buddy with a pending subscription.

deryni noticed that an attempt to remove the buddy would put them in
the Buddies group (a second removal succeeded).

ejabberd responds to the initial removal with a roster push that looks like:
<item ask='subscribe' subscription='remove' jid='user@example.com'/>

The subscribe was munging up this check. The user is no longer listed in
the roster, though.

diff -r f7d7cf32a715 -r 5c61429ea529 libpurple/protocols/jabber/roster.c
--- a/libpurple/protocols/jabber/roster.c	Sun Oct 04 18:01:35 2009 +0000
+++ b/libpurple/protocols/jabber/roster.c	Mon Oct 05 18:10:08 2009 +0000
@@ -229,7 +229,7 @@
 		else
 			jb->subscription &= ~JABBER_SUB_PENDING;
 
-		if(jb->subscription == JABBER_SUB_REMOVE) {
+		if(jb->subscription & JABBER_SUB_REMOVE) {
 			remove_purple_buddies(js, jid);
 		} else {
 			GSList *groups = NULL;