pidgin: 120687ec: jabber: The second half; advertise the v...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 120687eccc7c6a7af34bb11e4e286667401bfc43
Ancestor: dbaf898ed87f7d5508c202ad58882dfb4abb9072
Author: darkrain42 at pidgin.im
Date: 2009-11-13T18:47:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/120687eccc7c6a7af34bb11e4e286667401bfc43

Modified files:
        libpurple/protocols/jabber/buddy.c

ChangeLog: 

jabber: The second half; advertise the vCard avatar, whatever it is.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	567babef3366c51d91131d5d5b2876b14c0b7053
+++ libpurple/protocols/jabber/buddy.c	204fd5035baa41bb376e891bccb0a223c54535f7
@@ -936,9 +936,13 @@ static void jabber_vcard_save_mine(Jabbe
 			                                             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);