diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-30 23:08:34 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:06 +0800 |
| commit | a56fa2a95e93ad68ca08f336178b26baf3b3f29d (patch) | |
| tree | 547ac5a682a4fc8c4f8281d1f1bb4e7a39ff8daa /libempathy-gtk/empathy-avatar-image.c | |
| parent | 3abe4df5f32c37e968d0556c755b8387d9f1f771 (diff) | |
| download | gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar.gz gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar.bz2 gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar.lz gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar.xz gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.tar.zst gsoc2013-empathy-a56fa2a95e93ad68ca08f336178b26baf3b3f29d.zip | |
pixbuf-utils: copy the generic pixbuf-related utily functions from Empathy
This commit also changes the licence of the moved code from GPL to LGPL.
See GOSSIP-RELICENSING.txt for details.
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk/empathy-avatar-image.c')
| -rw-r--r-- | libempathy-gtk/empathy-avatar-image.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index f61c1b236..78a3e5ff3 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -26,6 +26,7 @@ #include <glib/gi18n-lib.h> #include <gdk/gdkx.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include "empathy-ui-utils.h" #include "empathy-utils.h" @@ -211,7 +212,7 @@ avatar_image_button_press_event (GtkWidget *widget, GdkEventButton *event) return TRUE; } - pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE); + pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE); popup_width = gdk_pixbuf_get_width (pixbuf); popup_height = gdk_pixbuf_get_height (pixbuf); @@ -302,7 +303,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image, } if (avatar) { - priv->pixbuf = empathy_pixbuf_from_data ((gchar *) avatar->data, + priv->pixbuf = tpaw_pixbuf_from_data ((gchar *) avatar->data, avatar->len); } @@ -311,7 +312,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image, return; } - scaled_pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL); + scaled_pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL); gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled_pixbuf); if (scaled_pixbuf != priv->pixbuf) { |