# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1182740235 0
# Node ID ad450d54e72dc09ca1f130a6a4cf1f14dc0cc787
# Parent  1faa319ab4c3884a480994c78697d11de21cf79f# Parent  54ad47857b7b818251c63cdca2b8012e1a0040d9
merge of '12d65ba57d0e91f1bd68b923a95faab92a2bebe1'
     and 'b0753c11df84cce7262621801d1d625cb3366495'

diff -r 1faa319ab4c3 -r ad450d54e72d libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Mon Jun 25 02:16:58 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Mon Jun 25 02:57:15 2007 +0000
@@ -565,9 +565,7 @@
 		}
 
 		if((found_jbr = jabber_buddy_find_resource(jb, NULL))) {
-			if(!jbr || jbr == found_jbr) {
-				purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(state), "priority", found_jbr->priority, found_jbr->status ? "message" : NULL, found_jbr->status, NULL);
-			}
+			purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(state), "priority", found_jbr->priority, found_jbr->status ? "message" : NULL, found_jbr->status, NULL);
 		} else {
 			purple_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL);
 		}