diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-06-10 18:39:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-06-10 19:47:36 +0800 |
| commit | 65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771 (patch) | |
| tree | 2c47eb9fd5d0d64fc3cf31494f955d5c1aeec94b | |
| parent | 4b892eeb5e6c85706e14a28f5e7e5b9cd4fcd23e (diff) | |
| download | gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar.gz gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar.bz2 gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar.lz gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar.xz gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.tar.zst gsoc2013-empathy-65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771.zip | |
Rationalize use of EMPATHY_IMAGE_CALL_* images (#652270)
We now always use call-start for incoming and outgoing calls and call-stop for
missed ones. Ideally it would be cool to have different icons for incoming and
outgoing but that will do for now.
| -rw-r--r-- | libempathy-gtk/empathy-images.h | 5 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index e2512d495..0761fd778 100644 --- a/libempathy-gtk/empathy-images.h +++ b/libempathy-gtk/empathy-images.h @@ -47,9 +47,10 @@ G_BEGIN_DECLS #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" #define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default" -#define EMPATHY_IMAGE_CALL_MISSED "call-start" +#define EMPATHY_IMAGE_CALL "call-start" +#define EMPATHY_IMAGE_CALL_MISSED "call-stop" #define EMPATHY_IMAGE_CALL_INCOMING "call-start" -#define EMPATHY_IMAGE_CALL_OUTGOING "call-stop" +#define EMPATHY_IMAGE_CALL_OUTGOING "call-start" G_END_DECLS diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 4ff658834..ef004b40c 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -2270,14 +2270,14 @@ log_window_what_setup (EmpathyLogWindow *window) { WHAT_TYPE_SEPARATOR, 0, NULL, "separator" }, { TPL_EVENT_MASK_TEXT, 0, "stock_text_justify", _("Text chats") }, #ifdef HAVE_CALL_LOGS - { TPL_EVENT_MASK_CALL, EVENT_CALL_ALL, "call-start", _("Calls") }, + { TPL_EVENT_MASK_CALL, EVENT_CALL_ALL, EMPATHY_IMAGE_CALL, _("Calls") }, #endif }; #ifdef HAVE_CALL_LOGS struct event call_events [] = { - { TPL_EVENT_MASK_CALL, EVENT_CALL_INCOMING, "call-start", _("Incoming calls") }, - { TPL_EVENT_MASK_CALL, EVENT_CALL_OUTGOING, "call-start", _("Outgoing calls") }, - { TPL_EVENT_MASK_CALL, EVENT_CALL_MISSED, "call-stop", _("Missed calls") } + { TPL_EVENT_MASK_CALL, EVENT_CALL_INCOMING, EMPATHY_IMAGE_CALL_INCOMING, _("Incoming calls") }, + { TPL_EVENT_MASK_CALL, EVENT_CALL_OUTGOING, EMPATHY_IMAGE_CALL_OUTGOING, _("Outgoing calls") }, + { TPL_EVENT_MASK_CALL, EVENT_CALL_MISSED, EMPATHY_IMAGE_CALL_MISSED, _("Missed calls") } }; GtkTreeIter parent; #endif |