From b3909bd20099b02b3f9d4a3ba0cc4cfd477152e5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 11 Nov 2008 15:27:58 +0000 Subject: [PATCH] Add empathy_pixbuf_from_data_and_mime instead of breaking API. svn path=/trunk/; revision=1706 --- libempathy-gtk/empathy-avatar-chooser.c | 6 ++++-- libempathy-gtk/empathy-avatar-image.c | 2 +- libempathy-gtk/empathy-ui-utils.c | 13 ++++++++++--- libempathy-gtk/empathy-ui-utils.h | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index e016f1d1..8a81c3d8 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -521,7 +521,7 @@ avatar_chooser_set_image_from_data (EmpathyAvatarChooser *chooser, return; } - pixbuf = empathy_pixbuf_from_data (data, size, &mime_type); + pixbuf = empathy_pixbuf_from_data_and_mime (data, size, &mime_type); if (pixbuf == NULL) { g_free (data); return; @@ -543,7 +543,9 @@ avatar_chooser_set_image_from_avatar (EmpathyAvatarChooser *chooser, g_assert (avatar != NULL); - pixbuf = empathy_pixbuf_from_data (avatar->data, avatar->len, &mime_type); + pixbuf = empathy_pixbuf_from_data_and_mime (avatar->data, + avatar->len, + &mime_type); if (pixbuf == NULL) { DEBUG ("couldn't make a pixbuf from avatar; giving up"); return; diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index 6b378b60..7dd93aad 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -276,7 +276,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image, } if (avatar) { - priv->pixbuf = empathy_pixbuf_from_data (avatar->data, avatar->len, NULL); + priv->pixbuf = empathy_pixbuf_from_data (avatar->data, avatar->len); } if (!priv->pixbuf) { diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 533c3917..c7e70da3 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -245,9 +245,16 @@ empathy_icon_name_for_contact (EmpathyContact *contact) } GdkPixbuf * -empathy_pixbuf_from_data (gchar *data, - gsize data_size, - gchar **mime_type) +empathy_pixbuf_from_data (gchar *data, + gsize data_size) +{ + return empathy_pixbuf_from_data_and_mime (data, data_size, NULL); +} + +GdkPixbuf * +empathy_pixbuf_from_data_and_mime (gchar *data, + gsize data_size, + gchar **mime_type) { GdkPixbufLoader *loader; GdkPixbufFormat *format; diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index be87b94c..524d8eb9 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -69,6 +69,8 @@ const gchar * empathy_icon_name_from_account (McAccount *accou const gchar * empathy_icon_name_for_presence (McPresence presence); const gchar * empathy_icon_name_for_contact (EmpathyContact *contact); GdkPixbuf * empathy_pixbuf_from_data (gchar *data, + gsize data_size); +GdkPixbuf * empathy_pixbuf_from_data_and_mime (gchar *data, gsize data_size, gchar **mime_type); GdkPixbuf * empathy_pixbuf_from_avatar_scaled (EmpathyAvatar *avatar, -- 2.39.2