Mercurial > pidgin.yaz

changeset 28915:edb503872793

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jabber: The second half; advertise the vCard avatar, whatever it is.
author Paul Aurich <paul@darkrain42.org>
date Fri, 13 Nov 2009 18:47:52 +0000
parents e14402d6c5e0
children ea818ffa22b6
files libpurple/protocols/jabber/buddy.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Fri Nov 13 18:39:23 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri Nov 13 18:47:52 2009 +0000
@@ -936,9 +936,13 @@
 			                                             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);