# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1258138072 0
# Node ID edb503872793dad221b455da4605b11f29377390
# Parent  e14402d6c5e0d39f94937bc81d33111b18a156d7
jabber: The second half; advertise the vCard avatar, whatever it is.

diff -r e14402d6c5e0 -r edb503872793 libpurple/protocols/jabber/buddy.c
--- 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);