# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1161295345 0
# Node ID 36b55cb22bc26b5c1ab78e658f9b9a90cef10dac
# Parent  bcc210a3c4a6fa4ef5ee548de9390e83023a869c
[gaim-migrate @ 17549]
Fix bug #1580569

committer: Tailor Script <tailor@pidgin.im>

diff -r bcc210a3c4a6 -r 36b55cb22bc2 gtk/gtkstatusbox.c
--- a/gtk/gtkstatusbox.c	Thu Oct 19 14:05:30 2006 +0000
+++ b/gtk/gtkstatusbox.c	Thu Oct 19 22:02:25 2006 +0000
@@ -1231,19 +1231,19 @@
 		}
 		gtk_gaim_status_box_set_buddy_icon(box, filename);
 	}
-
-	box->buddy_icon_sel = NULL;
 }
 
 static void
 icon_choose_cb(const char *filename, gpointer data)
 {
 	GtkGaimStatusBox *box = data;
-	if (box->account == NULL)
+	if (box->account == NULL && filename)
 		/* The pref-connect callback does the actual work */
 		gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
 	else
 		buddy_icon_set_cb(filename, data);
+
+	box->buddy_icon_sel = NULL;
 }
 
 static void