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-individual-view.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-individual-view.c')
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 22e65a0ec..b901848e1 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -28,6 +28,7 @@ #include "empathy-individual-view.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-cell-renderer-activatable.h" @@ -1161,12 +1162,12 @@ individual_view_group_icon_cell_data_func (GtkTreeViewColumn *tree_column, if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_FAVORITE)) { - pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite", + pixbuf = tpaw_pixbuf_from_icon_name ("emblem-favorite", GTK_ICON_SIZE_MENU); } else if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY)) { - pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp", + pixbuf = tpaw_pixbuf_from_icon_name ("im-local-xmpp", GTK_ICON_SIZE_MENU); } |