# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1246594876 0
# Node ID 1643ace55ef88d579de6dd6fc96cccbb3f03d452
# Parent  fc920924cea375c5d82caad57191db94016f9f93
Don't try to read in '' as our account icon. I don't know if I have a messed up prefs.xml or something else changed recently.

diff -r fc920924cea3 -r 1643ace55ef8 libpurple/imgstore.c
--- a/libpurple/imgstore.c	Fri Jul 03 02:51:20 2009 +0000
+++ b/libpurple/imgstore.c	Fri Jul 03 04:21:16 2009 +0000
@@ -75,6 +75,8 @@
 	size_t len;
 	GError *err = NULL;
 
+	g_return_val_if_fail(path != NULL && *path != '\0', NULL);
+
 	if (!g_file_get_contents(path, &data, &len, &err)) {
 		purple_debug_error("imgstore", "Error reading %s: %s\n",
 				path, err->message);
diff -r fc920924cea3 -r 1643ace55ef8 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Fri Jul 03 02:51:20 2009 +0000
+++ b/pidgin/gtkaccount.c	Fri Jul 03 04:21:16 2009 +0000
@@ -1990,7 +1990,7 @@
 				/* This is for when set_account() is called for a single account */
 				const char *path;
 				path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
-				if (path != NULL)
+				if (path != NULL && *path != '\0')
 					img = purple_imgstore_new_from_file(path);
 			}
 		} else {