empathy r2817 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Apr 13 09:11:32 2009
New Revision: 2817
URL: http://svn.gnome.org/viewvc/empathy?rev=2817&view=rev

Log:
Set the default image when clearing the avatar, even if there were no avatar previously. That happens when the widget is created. Fixe bug #566905

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/libempathy-gtk/empathy-avatar-chooser.c

Modified: trunk/libempathy-gtk/empathy-avatar-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-avatar-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-avatar-chooser.c	Mon Apr 13 09:11:32 2009
@@ -578,13 +578,11 @@
 	EmpathyAvatarChooserPriv *priv = GET_PRIV (chooser);
 	GtkWidget *image;
 
-	if (priv->avatar == NULL) {
-		return;
+	if (priv->avatar != NULL) {
+		empathy_avatar_unref (priv->avatar);
+		priv->avatar = NULL;
 	}
 
-	empathy_avatar_unref (priv->avatar);
-	priv->avatar = NULL;
-
 	image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG);
 	gtk_button_set_image (GTK_BUTTON (chooser), image);
 	g_signal_emit (chooser, signals[CHANGED], 0);