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-theme-adium.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-theme-adium.c')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 5fd61d339..0cf74e396 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -25,6 +25,7 @@ #include <glib/gi18n-lib.h> #include <tp-account-widgets/tpaw-images.h> #include <tp-account-widgets/tpaw-time.h> +#include <tp-account-widgets/tpaw-pixbuf-utils.h> #include <tp-account-widgets/tpaw-utils.h> #include "empathy-gsettings.h" @@ -954,7 +955,7 @@ theme_adium_add_message (EmpathyThemeAdium *self, { if (!self->priv->data->default_avatar_filename) self->priv->data->default_avatar_filename = - empathy_filename_from_icon_name (TPAW_IMAGE_AVATAR_DEFAULT, + tpaw_filename_from_icon_name (TPAW_IMAGE_AVATAR_DEFAULT, GTK_ICON_SIZE_DIALOG); avatar_filename = self->priv->data->default_avatar_filename; |