Mercurial > pidgin
changeset 27574:b2f0d92aa299
merge of '47cc43740a8e5263c6eeb5b06416b3ba2434c57d'
and '7cbc752a8f08158849396dab8039719a06b82ea9'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 16 Jul 2009 05:28:53 +0000 |
| parents | 29e85d424701 (current diff) ccb1f1777df7 (diff) |
| children | 307f346eefa2 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Thu Jul 16 05:28:17 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Thu Jul 16 05:28:53 2009 +0000 @@ -91,9 +91,9 @@ } if ((jbr = jabber_buddy_find_resource(jb, NULL))) { - purple_prpl_got_user_status(js->gc->account, username, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); + purple_prpl_got_user_status(account, username, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); } else { - purple_prpl_got_user_status(js->gc->account, username, "offline", msg ? "message" : NULL, msg, NULL); + purple_prpl_got_user_status(account, username, "offline", msg ? "message" : NULL, msg, NULL); } g_free(msg); }