aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2012-04-03 08:41:54 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2012-04-03 15:04:25 +0800
commitffd92c745b62faa628b17c8642f97ee596d933e1 (patch)
tree072a5436159ed7325d7e9307241aa2bfd7135335 /libempathy-gtk
parent86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 (diff)
downloadgsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar.gz
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar.bz2
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar.lz
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar.xz
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.tar.zst
gsoc2013-empathy-ffd92c745b62faa628b17c8642f97ee596d933e1.zip
Logger support for calls is no longer optional
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-log-window.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index c11bb02c3..108765370 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -35,9 +35,7 @@
#include <telepathy-glib/proxy-subclass.h>
#include <telepathy-logger/telepathy-logger.h>
-#ifdef HAVE_CALL_LOGS
-# include <telepathy-logger/call-event.h>
-#endif
+#include <telepathy-logger/call-event.h>
#include <extensions/extensions.h>
@@ -1232,7 +1230,6 @@ get_icon_for_event (TplEvent *event)
if (!tp_str_empty (tpl_text_event_get_supersedes_token (text)))
icon = EMPATHY_IMAGE_EDIT_MESSAGE;
}
-#ifdef HAVE_CALL_LOGS
else if (TPL_IS_CALL_EVENT (event))
{
TplCallEvent *call = TPL_CALL_EVENT (event);
@@ -1247,7 +1244,6 @@ get_icon_for_event (TplEvent *event)
else if (tpl_entity_get_entity_type (receiver) == TPL_ENTITY_SELF)
icon = EMPATHY_IMAGE_CALL_INCOMING;
}
-#endif
return icon;
}
@@ -1313,7 +1309,6 @@ log_window_append_chat_message (TplEvent *event,
g_date_time_unref (date);
}
-#ifdef HAVE_CALL_LOGS
static void
log_window_append_call (TplEvent *event,
EmpathyMessage *message)
@@ -1404,7 +1399,6 @@ log_window_append_call (TplEvent *event,
g_free (pretty_date);
g_date_time_unref (started_date);
}
-#endif
static void
log_window_append_message (TplEvent *event,
@@ -1412,10 +1406,8 @@ log_window_append_message (TplEvent *event,
{
if (TPL_IS_TEXT_EVENT (event))
log_window_append_chat_message (event, message);
-#ifdef HAVE_CALL_LOGS
else if (TPL_IS_CALL_EVENT (event))
log_window_append_call (event, message);
-#endif
else
DEBUG ("Message type not handled");
}
@@ -3034,23 +3026,21 @@ log_window_what_setup (EmpathyLogWindow *self)
GtkTreeIter iter;
GtkTreeStore *store;
GtkCellRenderer *cell;
+ GtkTreeIter parent;
guint i;
+
struct event events [] = {
{ TPL_EVENT_MASK_ANY, 0, NULL, _("Anything") },
{ WHAT_TYPE_SEPARATOR, 0, NULL, "separator" },
{ TPL_EVENT_MASK_TEXT, 0, "format-justify-fill", _("Text chats") },
-#ifdef HAVE_CALL_LOGS
{ 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, 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
view = GTK_TREE_VIEW (self->priv->treeview_what);
selection = gtk_tree_view_get_selection (view);
@@ -3108,7 +3098,6 @@ log_window_what_setup (EmpathyLogWindow *self)
-1);
}
-#ifdef HAVE_CALL_LOGS
gtk_tree_model_iter_nth_child (model, &parent, NULL, 3);
for (i = 0; i < G_N_ELEMENTS (call_events); i++)
{
@@ -3121,7 +3110,6 @@ log_window_what_setup (EmpathyLogWindow *self)
COL_WHAT_ICON, call_events[i].icon,
-1);
}
-#endif
gtk_tree_view_expand_all (view);
@@ -3228,7 +3216,6 @@ log_window_got_messages_for_date_cb (GObject *manager,
TplEvent *event = l->data;
gboolean append = TRUE;
-#ifdef HAVE_CALL_LOGS
if (TPL_IS_CALL_EVENT (l->data)
&& ctx->event_mask & TPL_EVENT_MASK_CALL
&& ctx->event_mask != TPL_EVENT_MASK_ANY)
@@ -3265,7 +3252,6 @@ log_window_got_messages_for_date_cb (GObject *manager,
}
}
}
-#endif
if (append)
{