comparison libpurple/protocols/jabber/useravatar.c @ 28914:e14402d6c5e0

jabber: Go back to not overwriting avatars if there is not one locally set. This isn't quite right yet, because we need to pick up the hash and advertise it in our presence. Fixes #10287.

28913:43d5face5d9b

	/*
	 * If we have an avatar and the server returned an error/malformed data,
	 * push our avatar. If the server avatar doesn't match the local one, push
	 * our avatar.
	 */
	if (((!items || !metadata) && js->initial_avatar_hash) ||
			!purple_strequal(server_hash, js->initial_avatar_hash)) {
		PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
		jabber_avatar_set(js, img);
		purple_imgstore_unref(img);
	}
}

void jabber_avatar_fetch_mine(JabberStream *js)
{
	char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
	jabber_pep_request_item(js, jid, NS_AVATAR_0_12_METADATA, NULL,
	                        do_got_own_avatar_0_12_cb);
	jabber_pep_request_item(js, jid, NS_AVATAR_1_1_METADATA, NULL,
	                        do_got_own_avatar_cb);
	g_free(jid);
}

typedef struct _JabberBuddyAvatarUpdateURLInfo {
	JabberStream *js;

28914:e14402d6c5e0

	/*
	 * If we have an avatar and the server returned an error/malformed data,
	 * push our avatar. If the server avatar doesn't match the local one, push
	 * our avatar.
	 */
	if ((!items || !metadata) ||
			!purple_strequal(server_hash, js->initial_avatar_hash)) {
		PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
		jabber_avatar_set(js, img);
		purple_imgstore_unref(img);
	}
}

void jabber_avatar_fetch_mine(JabberStream *js)
{
	char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);

	if (js->initial_avatar_hash) {
		jabber_pep_request_item(js, jid, NS_AVATAR_0_12_METADATA, NULL,
		                        do_got_own_avatar_0_12_cb);
		jabber_pep_request_item(js, jid, NS_AVATAR_1_1_METADATA, NULL,
		                        do_got_own_avatar_cb);
	}

	g_free(jid);
}

typedef struct _JabberBuddyAvatarUpdateURLInfo {
	JabberStream *js;