# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1199829682 0
# Node ID 47286f9bb434c92e2583f409cd5d012299363bff
# Parent  f4c0a70144981e9f011fbf32e5772d89a2c8ab58# Parent  b526b6c679d91b579a61882dc1525a18eef628f3
merge of '5d18b4aee9c05f592af532f9155aadb23ad11d4b'
     and '6d8a02b102307c89d31b4eddc0ceee59673d157b'

diff -r b526b6c679d9 -r 47286f9bb434 libpurple/buddyicon.c
--- 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(),