diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-11-13 18:47:52 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-11-13 18:47:52 +0000 |
| commit | 0a33b2c6badda01eb9a50e1e1013c72dcc305a75 (patch) | |
| tree | 35308d702bbc23efb9759974fdf479bfd803e875 | |
| parent | 50d6147c470036db147ae42266bd8122602f0cef (diff) | |
| download | pidgin-0a33b2c6badda01eb9a50e1e1013c72dcc305a75.tar.gz | |
jabber: The second half; advertise the vCard avatar, whatever it is.
| -rw-r--r-- | libpurple/protocols/jabber/buddy.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c index 48340baaf7..50928af557 100644 --- a/libpurple/protocols/jabber/buddy.c +++ b/libpurple/protocols/jabber/buddy.c @@ -936,9 +936,13 @@ static void jabber_vcard_save_mine(JabberStream *js, const char *from, js); else jabber_set_info(js->gc, purple_account_get_user_info(account)); - } else if (js->initial_avatar_hash) { - /* Our photo is in the vcard, so advertise vcard-temp updates */ - js->avatar_hash = g_strdup(js->initial_avatar_hash); + } else { + /* A photo is in the vCard. Advertise its hash */ + js->avatar_hash = vcard_hash; + vcard_hash = NULL; + + /* Send presence to update vcard-temp:x:update */ + jabber_presence_send(js, FALSE); } g_free(vcard_hash); |