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-protocol-chooser.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-protocol-chooser.c')
| -rw-r--r-- | libempathy-gtk/empathy-protocol-chooser.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index f2414ad10..3966809f7 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -25,6 +25,7 @@ #include <glib/gi18n-lib.h> #include <tp-account-widgets/tpaw-connection-managers.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-ui-utils.h" @@ -231,7 +232,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser, g_strdup (proto_name), g_strdup (cm_name)); icon_name = tpaw_protocol_icon_name (proto_name); - pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); + pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); display_name = tpaw_protocol_name_to_display_name (proto_name); @@ -249,7 +250,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser, !tp_strdiff (cm_name, "gabble")) { display_name = tpaw_service_name_to_display_name ("google-talk"); - pixbuf = empathy_pixbuf_from_icon_name ("im-google-talk", + pixbuf = tpaw_pixbuf_from_icon_name ("im-google-talk", GTK_ICON_SIZE_BUTTON); gtk_list_store_insert_with_values (priv->store, @@ -264,7 +265,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser, g_clear_object (&pixbuf); display_name = tpaw_service_name_to_display_name ("facebook"); - pixbuf = empathy_pixbuf_from_icon_name ("im-facebook", + pixbuf = tpaw_pixbuf_from_icon_name ("im-facebook", GTK_ICON_SIZE_BUTTON); gtk_list_store_insert_with_values (priv->store, |