comparison libpurple/protocols/jabber/buddy.c @ 32299:fa183182bc2b

Update js->initial_avatar_hash if the user tries to set the icon before we've received our self vcard. This is the other half of a fix to get rid of a race condition where the user's icon wouldn't get set correctly if they set it while connecting.

32298:515ed916e691

	xmlnode *vc_node;
	const struct tag_attr *tag_attr;

	/* if we haven't grabbed the remote vcard yet, we can't
	 * assume that what we have here is correct */
	if(!js->vcard_fetched)
		return;

	if (js->vcard_timer) {
		purple_timeout_remove(js->vcard_timer);
		js->vcard_timer = 0;
	}

32299:fa183182bc2b

	xmlnode *vc_node;
	const struct tag_attr *tag_attr;

	/* if we haven't grabbed the remote vcard yet, we can't
	 * assume that what we have here is correct */
	if(!js->vcard_fetched) {
		PurpleStoredImage *image;
		g_free(js->initial_avatar_hash);
		image = purple_buddy_icons_find_account_icon(purple_connection_get_account(gc));
		if (image != NULL) {
			js->initial_avatar_hash =
					jabber_calculate_data_hash(purple_imgstore_get_data(image),
			purple_imgstore_get_size(image), "sha1");
			purple_imgstore_unref(image);
		} else {
			js->initial_avatar_hash = NULL;
		}
		return;
	}

	if (js->vcard_timer) {
		purple_timeout_remove(js->vcard_timer);
		js->vcard_timer = 0;
	}