Mercurial > pidgin
changeset 26736:a0e48796defb
Fix merging.
I blame meld and the fact I didn't `mtn copy buddy.c useravatar.c`.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 28 Apr 2009 18:57:47 +0000 |
| parents | 3912f55a1633 |
| children | 8b7d1aed6d59 |
| files | libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/useravatar.c |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Tue Apr 28 18:43:57 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Apr 28 18:57:47 2009 +0000 @@ -1637,14 +1637,12 @@ void jabber_idle_set(PurpleConnection *gc, int idle) { JabberStream *js = gc->proto_data; - PurpleAccount *account = purple_connection_get_account(gc); - PurpleStatus *status = purple_account_get_active_status(account); js->idle = idle ? time(NULL) - idle : idle; /* send out an updated prescence */ purple_debug_info("jabber", "sending updated presence for idle\n"); - jabber_presence_send(account, status); + jabber_presence_send(js, FALSE); } static void jabber_blocklist_parse(JabberStream *js, const char *from,
--- a/libpurple/protocols/jabber/useravatar.c Tue Apr 28 18:43:57 2009 +0000 +++ b/libpurple/protocols/jabber/useravatar.c Tue Apr 28 18:57:47 2009 +0000 @@ -33,15 +33,15 @@ void jabber_avatar_init(void) { - jabber_pep_register_handler("avatar", NS_AVATAR_0_12_METADATA, + jabber_pep_register_handler(NS_AVATAR_0_12_METADATA, update_buddy_metadata); - jabber_add_feature("urn_avatarmeta", NS_AVATAR_1_1_METADATA, + jabber_add_feature(NS_AVATAR_1_1_METADATA, jabber_pep_namespace_only_when_pep_enabled_cb); - jabber_add_feature("urn_avatardata", NS_AVATAR_1_1_DATA, + jabber_add_feature(NS_AVATAR_1_1_DATA, jabber_pep_namespace_only_when_pep_enabled_cb); - jabber_pep_register_handler("urn_avatar", NS_AVATAR_1_1_METADATA, + jabber_pep_register_handler(NS_AVATAR_1_1_METADATA, update_buddy_metadata); }