Don't modify EmpathyAvatar::format if gdkpixbuf disagrees

svn path=/trunk/; revision=1705

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 78535b439a98e610235d3c1dffb4ef07c149683a..e016f1d13a90d86cd8e7e90a7b1473c94f2979e5 100644 (file)
--- 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);
        }