Mercurial > pidgin.yaz
changeset 28693:5c61429ea529
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.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 05 Oct 2009 18:10:08 +0000 |
| parents | f7d7cf32a715 |
| children | c7aaad89a2f8 aa619162370b |
| files | libpurple/protocols/jabber/roster.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;