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 /src | |
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 'src')
-rw-r--r-- | src/empathy-accounts-dialog.c | 3 | ||||
-rw-r--r-- | src/empathy-call-window.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index ca5d57f5c..aa1f9ab31 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -31,6 +31,7 @@ #include <tp-account-widgets/tpaw-account-widget.h> #include <tp-account-widgets/tpaw-builder.h> #include <tp-account-widgets/tpaw-user-info.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-accounts-common.h" @@ -1023,7 +1024,7 @@ ensure_icon (EmpathyAccountsDialog *self, pixbuf = g_hash_table_lookup (priv->icons_cache, icon_name); if (pixbuf == NULL) { - pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); + pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); if (pixbuf == NULL) return NULL; diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 6c215b53b..39c70c17b 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -28,6 +28,7 @@ #include <tp-account-widgets/tpaw-builder.h> #include <tp-account-widgets/tpaw-camera-monitor.h> #include <tp-account-widgets/tpaw-images.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-about-dialog.h" @@ -1893,7 +1894,7 @@ init_contact_avatar_with_size (EmpathyContact *contact, if (pixbuf_avatar == NULL) { - pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ( + pixbuf_avatar = tpaw_pixbuf_from_icon_name_sized ( TPAW_IMAGE_AVATAR_DEFAULT, size); } |