pidgin: libpurple/buddyicon.c comparison

comparison libpurple/buddyicon.c @ 20410:522ade544156

propagate im.pidgin.pidgin to im.pidgin.cpw.khc.msnp14

author	Ka-Hing Cheung <khc@hxbc.us>
date	Sun, 06 May 2007 02:17:45 +0000
parents	9862a82206ba
children	a1858493abe2

comparison

equal deleted inserted replaced

-:7c0a2ef88018
+:522ade544156
 	/* purple_buddy_icon_create() sets account & username */
 	if (icon == NULL)
 		icon = purple_buddy_icon_create(account, username);
-	/* Take a reference for the caller of this function. */
-	icon->ref_count = 1;
 	/* purple_buddy_icon_set_data() sets img, but it
 	 * references img first, so we need to initialize it */
 	icon->img = NULL;
 	purple_buddy_icon_set_data(icon, icon_data, icon_len, checksum);
 {
 	PurpleConversation *conv;
 	PurpleAccount *account;
 	const char *username;
 	PurpleBuddyIcon *icon_to_set;
-	GSList *sl, *list;
+	GSList *buddies;
 	g_return_if_fail(icon != NULL);
 	account  = purple_buddy_icon_get_account(icon);
 	username = purple_buddy_icon_get_username(icon);
-	/* If no data exists, then call the functions below with NULL to
+	/* If no data exists (icon->img == NULL), then call the functions below
-	 * unset the icon.  They will then unref the icon and it should be
+	 * with NULL to unset the icon.  They will then unref the icon and it should
-	 * destroyed.  The only way it wouldn't be destroyed is if someone
+	 * be destroyed.  The only way it wouldn't be destroyed is if someone
 	 * else is holding a reference to it, in which case they can kill
 	 * the icon when they realize it has no data. */
 	icon_to_set = icon->img ? icon : NULL;
-	for (list = sl = purple_find_buddies(account, username);
+	/* Ensure that icon remains valid throughout */
-	     sl != NULL;
+	if (icon) purple_buddy_icon_ref(icon);
-	     sl = sl->next)
-	{
+	buddies = purple_find_buddies(account, username);
-		PurpleBuddy *buddy = (PurpleBuddy *)sl->data;
+	while (buddies != NULL)
+	{
+		PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
 		char *old_icon;
 		purple_buddy_set_icon(buddy, icon_to_set);
 		old_icon = g_strdup(purple_blist_node_get_string((PurpleBlistNode *)buddy,
 		                                                 "buddy_icon"));
 		if (icon->img && purple_buddy_icons_is_caching())
 		{
 			const char *filename = purple_imgstore_get_filename(icon->img);
 			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
 			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
 		}
 		unref_filename(old_icon);
 		g_free(old_icon);
-	}
+		buddies = g_slist_delete_link(buddies, buddies);
-	g_slist_free(list);
+	}
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, username, account);
 	if (conv != NULL)
 		purple_conv_im_set_icon(PURPLE_CONV_IM(conv), icon_to_set);
+	/* icon's refcount was incremented above */
+	if (icon) purple_buddy_icon_unref(icon);
 }
 void
 purple_buddy_icon_set_data(PurpleBuddyIcon *icon, guchar *data,
 size_t len, const char *checksum)
 			icon->img = purple_buddy_icon_data_new(data, len, NULL);
 		else
 			g_free(data);
 	}
+	g_free(icon->checksum);
 	icon->checksum = g_strdup(checksum);
 	purple_buddy_icon_update(icon);
 	purple_imgstore_unref(old_img);
 void
 purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,
 void *icon_data, size_t icon_len,
 const char *checksum)
 {
-	PurpleBuddyIcon *icon;
+	GHashTable *icon_cache;
+	PurpleBuddyIcon *icon = NULL;
 	g_return_if_fail(account  != NULL);
 	g_return_if_fail(username != NULL);
-	icon = purple_buddy_icons_find(account, username);
+	icon_cache = g_hash_table_lookup(account_cache, account);
+	if (icon_cache != NULL)
+		icon = g_hash_table_lookup(icon_cache, username);
 	if (icon != NULL)
 		purple_buddy_icon_set_data(icon, icon_data, icon_len, checksum);
-	else
+	else if (icon_data && icon_len > 0)
 	{
-		PurpleBuddyIcon *icon = purple_buddy_icon_new(account, username, icon_data, icon_len, checksum);
+		if (icon_data != NULL && icon_len > 0)
-		purple_buddy_icon_unref(icon);
+		{
+			PurpleBuddyIcon *icon = purple_buddy_icon_new(account, username, icon_data, icon_len, checksum);
+			/* purple_buddy_icon_new() calls
+			 * purple_buddy_icon_set_data(), which calls
+			 * purple_buddy_icon_update(), which has the buddy list
+			 * and conversations take references as appropriate.
+			 * This function doesn't return icon, so we can't
+			 * leave a reference dangling. */
+			purple_buddy_icon_unref(icon);
+		}
+		else
+		{
+			/* If the buddy list or a conversation was holding a
+			 * reference, we'd have found the icon in the cache.
+			 * Since we know we're deleting the icon, we only
+			 * need a subset of purple_buddy_icon_update(). */
+			GSList *buddies = purple_find_buddies(account, username);
+			while (buddies != NULL)
+			{
+				PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
+				unref_filename(purple_blist_node_get_string((PurpleBlistNode *)buddy, "buddy_icon"));
+				purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
+				purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
+				buddies = g_slist_delete_link(buddies, buddies);
+			}
+		}
 	}
 }
 char *purple_buddy_icon_get_full_path(PurpleBuddyIcon *icon)
 {
 			char *path = g_build_filename(dirname, protocol_icon_file, NULL);
 			if (read_icon_file(path, &data, &len))
 			{
 				const char *checksum;
-				if (icon == NULL)
+				icon = purple_buddy_icon_create(account, username);
-					icon = purple_buddy_icon_create(account, username);
 				icon->ref_count = 0;
 				icon->img = NULL;
-				checksum = g_strdup(purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum"));
+				checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum");
 				purple_buddy_icon_set_data(icon, data, len, checksum);
 			}
 			g_free(path);
 		}
 		purple_buddy_icons_set_caching(caching);
 	}
-	return icon;
+	return purple_buddy_icon_ref(icon);
 }
 gboolean
 purple_buddy_icons_has_custom_icon(PurpleContact *contact)
 {

Mercurial > pidgin

comparison libpurple/buddyicon.c @ 20410:522ade544156