From: Xavier Claessens <xclaesse@gmail.com>
Date: Mon, 13 Apr 2009 09:11:32 +0000 (+0000)
Subject: Set the default image when clearing the avatar, even if there were no avatar previous... 
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=1117be46a1f26a85bac16ee930204fa1f890c5cd

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>

svn path=/trunk/; revision=2817
---

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 5d1c90fc..04a5ed63 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -578,13 +578,11 @@ avatar_chooser_clear_image (EmpathyAvatarChooser *chooser)
 	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);