Patch #1224610 from Richard Laager
"Buddy icon cache files are removed when replacing icons but not when unsetting the icon. This patch corrects that."
--- a/ChangeLog Thu Jun 30 00:01:24 2005 -0400
+++ b/ChangeLog Thu Jun 30 00:33:22 2005 -0400
@@ -1,8 +1,10 @@
Gaim: The Pimpin' Penguin IM Client that's good for the soul!
* Fix system log start times for some protocols
* SILC compiles with newer SILC toolkit versions (Pekka Riikonen)
+ * Fixed a bug where buddy icon cache files were left in the icon + cache directory after they were no longer in use. version 1.3.1 (6/9/2005):
* The file transfer details section now also displays the full path to
--- a/ChangeLog.win32 Thu Jun 30 00:01:24 2005 -0400
+++ b/ChangeLog.win32 Thu Jun 30 00:33:22 2005 -0400
@@ -1,4 +1,4 @@
version 1.3.1 (6/9/2005):
--- a/VERSION Thu Jun 30 00:01:24 2005 -0400
+++ b/VERSION Thu Jun 30 00:33:22 2005 -0400
@@ -1,1 +1,1 @@
--- a/configure.ac Thu Jun 30 00:01:24 2005 -0400
+++ b/configure.ac Thu Jun 30 00:33:22 2005 -0400
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [1.3.2cvs], [gaim-devel@lists.sourceforge.net])+AC_INIT([gaim], [1.4.0cvs], [gaim-devel@lists.sourceforge.net]) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
--- a/plugins/ChangeLog.API Thu Jun 30 00:01:24 2005 -0400
+++ b/plugins/ChangeLog.API Thu Jun 30 00:33:22 2005 -0400
@@ -1,7 +1,8 @@
Gaim: The Pimpin' Penguin IM Client that's good for the soul!
+ * Added: gaim_buddy_icon_uncache() + Deletes a cached buddy icon for a specified buddy version 1.3.1 (6/9/2005):
--- a/po/ChangeLog Thu Jun 30 00:01:24 2005 -0400
+++ b/po/ChangeLog Thu Jun 30 00:33:22 2005 -0400
@@ -1,6 +1,6 @@
Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
version 1.3.1 (6/9/2005):
--- a/src/blist.c Thu Jun 30 00:01:24 2005 -0400
+++ b/src/blist.c Thu Jun 30 00:33:22 2005 -0400
@@ -654,7 +654,7 @@
gaim_buddy_icon_cache(icon, buddy);
- gaim_blist_node_remove_setting((GaimBlistNode *)buddy, "buddy_icon");+ gaim_buddy_icon_uncache(buddy); gaim_blist_schedule_save();
--- a/src/buddyicon.c Thu Jun 30 00:01:24 2005 -0400
+++ b/src/buddyicon.c Thu Jun 30 00:33:22 2005 -0400
@@ -196,6 +196,25 @@
gaim_conv_im_set_icon(GAIM_CONV_IM(conv), icon);
+delete_icon_cache_file(const char *dirname, const char *old_icon) + g_return_if_fail(dirname != NULL); + g_return_if_fail(old_icon != NULL); + if (g_stat(old_icon, &st) == 0) + char *filename = g_build_filename(dirname, old_icon, NULL); + if (g_stat(filename, &st) == 0) gaim_buddy_icon_cache(GaimBuddyIcon *icon, GaimBuddy *buddy)
@@ -205,7 +224,6 @@
g_return_if_fail(icon != NULL);
@@ -242,16 +260,7 @@
- if(!g_stat(old_icon, &st))- filename = g_build_filename(dirname, old_icon, NULL);- if(!g_stat(filename, &st))+ delete_icon_cache_file(dirname, old_icon); gaim_blist_node_set_string((GaimBlistNode *)buddy, "buddy_icon", random);
@@ -259,6 +268,29 @@
+gaim_buddy_icon_uncache(GaimBuddy *buddy) + g_return_if_fail(buddy != NULL); + old_icon = gaim_blist_node_get_string((GaimBlistNode *)buddy, "buddy_icon"); + delete_icon_cache_file(gaim_buddy_icons_get_cache_dir(), old_icon); + gaim_blist_node_remove_setting((GaimBlistNode *)buddy, "buddy_icon"); + /* Unset the icon in case this function is called from + * something other than gaim_buddy_set_icon(). */ + if (buddy->icon != NULL) + gaim_buddy_icon_unref(buddy->icon); gaim_buddy_icon_set_account(GaimBuddyIcon *icon, GaimAccount *account)
g_return_if_fail(icon != NULL);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/buddyicon.h Thu Jun 30 00:33:22 2005 -0400
@@ -0,0 +1,250 @@
+ * @file buddyicon.h Buddy Icon API + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#ifndef _GAIM_BUDDYICON_H_ +#define _GAIM_BUDDYICON_H_ +typedef struct _GaimBuddyIcon GaimBuddyIcon; + GaimAccount *account; /**< The account the user is on. */ + char *username; /**< The username the icon belongs to. */ + void *data; /**< The buddy icon data. */ + size_t len; /**< The length of the buddy icon data. */ + int ref_count; /**< The buddy icon reference count. */ +/**************************************************************************/ +/** @name Buddy Icon API */ +/**************************************************************************/ + * Creates a new buddy icon structure. + * @param account The account the user is on. + * @param username The username the icon belongs to. + * @param icon_data The buddy icon data. + * @param icon_len The buddy icon length. + * @return The buddy icon structure. +GaimBuddyIcon *gaim_buddy_icon_new(GaimAccount *account, const char *username, + void *icon_data, size_t icon_len); + * Destroys a buddy icon structure. + * If the buddy icon's reference count is greater than 1, this will + * just decrease the reference count and return. + * @param icon The buddy icon structure to destroy. +void gaim_buddy_icon_destroy(GaimBuddyIcon *icon); + * Increments the reference count on a buddy icon. + * @param icon The buddy icon. +GaimBuddyIcon *gaim_buddy_icon_ref(GaimBuddyIcon *icon); + * Decrements the reference count on a buddy icon. + * If the reference count reaches 0, the icon will be destroyed. + * @param icon The buddy icon. + * @return @a icon, or @c NULL if the reference count reached 0. +GaimBuddyIcon *gaim_buddy_icon_unref(GaimBuddyIcon *icon); + * Updates every instance of this icon. + * @param icon The buddy icon. +void gaim_buddy_icon_update(GaimBuddyIcon *icon); + * Caches a buddy icon associated with a specific buddy to disk. + * @param icon The buddy icon. + * @param buddy The buddy that this icon belongs to. +void gaim_buddy_icon_cache(GaimBuddyIcon *icon, GaimBuddy *buddy); + * Removes cached buddy icon for a specific buddy. + * @param buddy The buddy for which to remove the cached icon. +void gaim_buddy_icon_uncache(GaimBuddy *buddy); + * Sets the buddy icon's account. + * @param icon The buddy icon. + * @param account The account. +void gaim_buddy_icon_set_account(GaimBuddyIcon *icon, GaimAccount *account); + * Sets the buddy icon's username. + * @param icon The buddy icon. + * @param username The username. +void gaim_buddy_icon_set_username(GaimBuddyIcon *icon, const char *username); + * Sets the buddy icon's icon data. + * @param icon The buddy icon. + * @param data The buddy icon data. + * @param len The length of the icon data. +void gaim_buddy_icon_set_data(GaimBuddyIcon *icon, void *data, size_t len); + * Returns the buddy icon's account. + * @param icon The buddy icon. +GaimAccount *gaim_buddy_icon_get_account(const GaimBuddyIcon *icon); + * Returns the buddy icon's username. + * @param icon The buddy icon. + * @return The username. +const char *gaim_buddy_icon_get_username(const GaimBuddyIcon *icon); + * Returns the buddy icon's data. + * @param icon The buddy icon. + * @param len The returned icon length. + * @return The icon data. +const void *gaim_buddy_icon_get_data(const GaimBuddyIcon *icon, size_t *len); +/**************************************************************************/ +/** @name Buddy Icon Subsystem API */ +/**************************************************************************/ + * Sets a buddy icon for a user. + * @param account The account the user is on. + * @param username The username of the user. + * @param icon_data The icon data. + * @param icon_len The length of the icon data. +void gaim_buddy_icons_set_for_user(GaimAccount *account, const char *username, + void *icon_data, size_t icon_len); + * Returns the buddy icon information for a user. + * @param account The account the user is on. + * @param username The username of the user. + * @return The icon data if found, or @c NULL if not found. +GaimBuddyIcon *gaim_buddy_icons_find(GaimAccount *account, + * Sets whether or not buddy icon caching is enabled. + * @param caching TRUE of buddy icon caching should be enabled, or +void gaim_buddy_icons_set_caching(gboolean caching); + * Returns whether or not buddy icon caching should be enabled. + * The default is TRUE, unless otherwise specified by + * gaim_buddy_icons_set_caching(). + * @return TRUE if buddy icon caching is enabled, or FALSE otherwise. +gboolean gaim_buddy_icons_is_caching(void); + * Sets the directory used to store buddy icon cache files. + * @param cache_dir The directory to store buddy icon cache files to. +void gaim_buddy_icons_set_cache_dir(const char *cache_dir); + * Returns the directory used to store buddy icon cache files. + * The default directory is GAIMDIR/icons, unless otherwise specified + * by gaim_buddy_icons_set_cache_dir(). + * @return The directory to store buddy icon cache files to. +const char *gaim_buddy_icons_get_cache_dir(void); + * Returns the buddy icon subsystem handle. + * @return The subsystem handle. +void *gaim_buddy_icons_get_handle(); + * Initializes the buddy icon subsystem. +void gaim_buddy_icons_init(); + * Uninitializes the buddy icon subsystem. +void gaim_buddy_icons_uninit(); +#endif /* _GAIM_BUDDYICON_H_ */
