From c6b2c7532181d69001c97edeb6e0b39d76298f76 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 11 Nov 2008 15:27:55 +0000 Subject: Don't modify EmpathyAvatar::format if gdkpixbuf disagrees svn path=/trunk/; revision=1705 --- libempathy-gtk/empathy-avatar-chooser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libempathy-gtk/empathy-avatar-chooser.c') diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 78535b439..e016f1d13 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -551,11 +551,11 @@ avatar_chooser_set_image_from_avatar (EmpathyAvatarChooser *chooser, if (avatar->format == NULL) { avatar->format = mime_type; - } else if (strcmp (mime_type, avatar->format)) { - DEBUG ("avatar had incorrect format! correcting"); - g_free (avatar->format); - avatar->format = mime_type; } else { + if (strcmp (mime_type, avatar->format)) { + DEBUG ("avatar->format is %s; gdkpixbuf yields %s!", + avatar->format, mime_type); + } g_free (mime_type); } -- cgit v1.2.3