[empathy] Rationalize use of EMPATHY_IMAGE_CALL_* images (#652270)



commit 65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Jun 10 12:39:42 2011 +0200

    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.

 libempathy-gtk/empathy-images.h     |    5 +++--
 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 e2512d4..0761fd7 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 4ff6588..ef004b4 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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]