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-smiley-manager.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-smiley-manager.c')
| -rw-r--r-- | libempathy-gtk/empathy-smiley-manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index fcbe56024..44ea817be 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -23,6 +23,7 @@ #include "config.h" #include "empathy-smiley-manager.h" +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-ui-utils.h" @@ -247,12 +248,12 @@ empathy_smiley_manager_add (EmpathySmileyManager *manager, g_return_if_fail (!TPAW_STR_EMPTY (icon_name)); g_return_if_fail (!TPAW_STR_EMPTY (first_str)); - pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); if (pixbuf) { gchar *path; va_start (var_args, first_str); - path = empathy_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + path = tpaw_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); smiley_manager_add_valist (manager, pixbuf, path, first_str, var_args); va_end (var_args); g_object_unref (pixbuf); |