diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-20 23:10:20 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-20 23:10:20 +0800 |
| commit | da99affb434f4bd1b61287ad812c3a5cfb297772 (patch) | |
| tree | 14b3e17923ea5c6a972a7e905ec365c13b65e17b /libempathy-gtk | |
| parent | bb43456be55d117ea23c65f3488c49a128dbcb62 (diff) | |
| download | gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar.gz gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar.bz2 gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar.lz gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar.xz gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.tar.zst gsoc2013-empathy-da99affb434f4bd1b61287ad812c3a5cfb297772.zip | |
use avatar-default instead of the deprecated stock_person icon
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-images.h | 1 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index bd878608e..a7e8683e8 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -34,6 +34,7 @@ #include "empathy-avatar-chooser.h" #include "empathy-conf.h" +#include "empathy-images.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER @@ -571,7 +572,8 @@ avatar_chooser_clear_image (EmpathyAvatarChooser *chooser) priv->avatar = NULL; } - image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG); + image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, + GTK_ICON_SIZE_DIALOG); gtk_button_set_image (GTK_BUTTON (chooser), image); g_signal_emit (chooser, signals[CHANGED], 0); } diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index a668395f5..2c40b2ae7 100644 --- a/libempathy-gtk/empathy-images.h +++ b/libempathy-gtk/empathy-images.h @@ -44,6 +44,7 @@ G_BEGIN_DECLS #define EMPATHY_IMAGE_VIDEO_CALL "camera-web" #define EMPATHY_IMAGE_LOG "document-open-recent" #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" +#define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default" G_END_DECLS diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 7736be270..ad174ce3b 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -41,6 +41,7 @@ #include "empathy-ui-utils.h" #include "empathy-plist.h" #include "empathy-string-parser.h" +#include "empathy-images.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include <libempathy/empathy-debug.h> @@ -491,7 +492,7 @@ theme_adium_append_message (EmpathyChatView *view, if (!avatar_filename) { if (!priv->data->default_avatar_filename) { priv->data->default_avatar_filename = - empathy_filename_from_icon_name ("stock_person", + empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, GTK_ICON_SIZE_DIALOG); } avatar_filename = priv->data->default_avatar_filename; |