pidgin: 98fe04f8: A fix from Paul Aurich for a long-standi...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 98fe04f817ef415faebd3f7a38b7f0588c0b0cba
Ancestor: d639e3065d1f99c8d438d6de98804498e850df47
Author: datallah at pidgin.im
Date: 2008-11-21T19:49:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/98fe04f817ef415faebd3f7a38b7f0588c0b0cba

Modified files:
        libpurple/protocols/jabber/presence.c

ChangeLog: 

A fix from Paul Aurich for a long-standing XMPP issue with duplicate buddies. Fixes #479.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/presence.c	1bb6fa1483cacef7ba9da2c4f3dcecff39c2eeb3
+++ libpurple/protocols/jabber/presence.c	66ab4ba4cf20586cdf0a054268387864947bb98a
@@ -459,7 +459,7 @@ void jabber_presence_parse(JabberStream 
 
 		if (buddy) {
 			jb = jabber_buddy_find(js, from, TRUE);
-			if ((jb->subscription & JABBER_SUB_TO))
+			if ((jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING)))
 				onlist = TRUE;
 		}