Mercurial > pidgin
changeset 18277:ad450d54e72d
merge of '12d65ba57d0e91f1bd68b923a95faab92a2bebe1'
and 'b0753c11df84cce7262621801d1d625cb3366495'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Mon, 25 Jun 2007 02:57:15 +0000 |
| parents | 1faa319ab4c3 (current diff) 54ad47857b7b (diff) |
| children | c3d5b91be081 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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); }