empathy r1705 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Nov 11 15:27:55 2008
New Revision: 1705
URL: http://svn.gnome.org/viewvc/empathy?rev=1705&view=rev

Log:
Don't modify EmpathyAvatar::format if gdkpixbuf disagrees

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	Tue Nov 11 15:27:55 2008
@@ -551,11 +551,11 @@
 
 	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);
 	}