aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:55 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:55 +0800
commitc6b2c7532181d69001c97edeb6e0b39d76298f76 (patch)
tree500be179f8f999e1efd05dd43002b8b43feec14d
parent6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc (diff)
downloadgsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar.gz
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar.bz2
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar.lz
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar.xz
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.tar.zst
gsoc2013-empathy-c6b2c7532181d69001c97edeb6e0b39d76298f76.zip
Don't modify EmpathyAvatar::format if gdkpixbuf disagrees
svn path=/trunk/; revision=1705
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c8
1 files changed, 4 insertions, 4 deletions
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);
}