changeset 22046:47286f9bb434

merge of '5d18b4aee9c05f592af532f9155aadb23ad11d4b' and '6d8a02b102307c89d31b4eddc0ceee59673d157b'
author Evan Schoenberg <evan.s@dreskin.net>
date Tue, 08 Jan 2008 22:01:22 +0000
parents f4c0a7014498 (diff) b526b6c679d9 (current diff)
children 62147d5b4512
files libpurple/buddyicon.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/buddyicon.c	Tue Jan 08 17:16:57 2008 +0000
+++ b/libpurple/buddyicon.c	Tue Jan 08 22:01:22 2008 +0000
@@ -1161,7 +1161,8 @@
 	                                        g_free, NULL);
 	pointer_icon_cache = g_hash_table_new(g_direct_hash, g_direct_equal);
 
-	cache_dir = g_build_filename(purple_user_dir(), "icons", NULL);
+    if (!cache_dir)
+    	cache_dir = g_build_filename(purple_user_dir(), "icons", NULL);
 
 	purple_signal_connect(purple_imgstore_get_handle(), "image-deleting",
 	                      purple_buddy_icons_get_handle(),