[Gaim-commits] SF.net SVN: gaim: [17549] trunk/gtk/gtkstatusbox.c

[<sa...@us...>]

Revision: 17549
          http://svn.sourceforge.net/gaim/?rev=17549&view=rev
Author:   sadrul
Date:     2006-10-19 15:02:25 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Fix bug #1580569

Modified Paths:
--------------
    trunk/gtk/gtkstatusbox.c

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-10-19 14:05:30 UTC (rev 17548)
+++ trunk/gtk/gtkstatusbox.c	2006-10-19 22:02:25 UTC (rev 17549)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.