Mercurial > pidgin
changeset 18314:7a8283c1eb75
merge of '475a8ca28dabbffcdd32005dfbc33c853b1eb7de'
and 'c200e222f8c30806d0c046ea71b4f3a8a86b0f72'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 27 Jun 2007 18:33:28 +0000 |
| parents | 4434e5c9d247 (diff) cf2fbfa205b1 (current diff) |
| children | e659842fe66d c7d344acd1ff |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Wed Jun 27 18:23:13 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Wed Jun 27 18:33:28 2007 +0000 @@ -558,6 +558,7 @@ jabber_buddy_remove_resource(jb, jid->resource); if((conv = jabber_find_unnormalized_conv(from, js->gc->account))) purple_conversation_set_name(conv, buddy_name); + printf("Removed resource\n"); } else { jbr = jabber_buddy_track_resource(jb, jid->resource, priority, @@ -565,7 +566,7 @@ } if((found_jbr = jabber_buddy_find_resource(jb, 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); + purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(found_jbr->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); }