Add empathy_pixbuf_from_data_and_mime instead of breaking API.

svn path=/trunk/; revision=1706

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index e016f1d13a90d86cd8e7e90a7b1473c94f2979e5..8a81c3d8b96801ee2a0d0341c7129aead457d450 100644 (file)
--- 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 6b378b606a224a6152b096a9ee919bea13342964..7dd93aad965c23a3fb77971042335e4e38db4dc2 100644 (file)
--- 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 533c39171dbc42a695e06d4027e7da75ebd4cbb5..c7e70da34ff38e4378ef5c99561b3a9eb1903194 100644 (file)
--- 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 be87b94c7b8a2e4049a747dd79fadf4d373b6793..524d8eb9dd53db8eeaa1f735eb159486af78ab2c 100644 (file)
--- 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,