diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-04-03 15:04:53 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-04-03 15:04:53 +0800 |
| commit | 4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8 (patch) | |
| tree | 1d486bb255557fbd2b445eb3eb1d73cb391de2ee /libempathy | |
| parent | f11ad07acca7b180723aa70c8ffa00aba5b361c1 (diff) | |
| parent | be2a0aa278149a082511bb3f4814f5850c970ce4 (diff) | |
| download | gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.gz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.bz2 gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.lz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.xz gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.tar.zst gsoc2013-empathy-4b95ad17bf3d3e4e0bf78ecdb10435e64bd416b8.zip | |
Merge branch 'gnome-3-4'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-message.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 6111bcd8c..777d4a672 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -35,9 +35,7 @@ #include <telepathy-logger/entity.h> #include <telepathy-logger/event.h> #include <telepathy-logger/text-event.h> -#ifdef HAVE_CALL_LOGS -# include <telepathy-logger/call-event.h> -#endif +#include <telepathy-logger/call-event.h> #include "empathy-client-factory.h" #include "empathy-message.h" @@ -405,13 +403,12 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) type = tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent)); token = tpl_text_event_get_message_token (textevent); } -#ifdef HAVE_CALL_LOGS else if (TPL_IS_CALL_EVENT (logevent)) { TplCallEvent *call = TPL_CALL_EVENT (logevent); timestamp = tpl_event_get_timestamp (logevent); - if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER) + if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER) body = g_strdup_printf (_("Missed call from %s"), tpl_entity_get_alias (tpl_event_get_sender (logevent))); else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF) @@ -422,7 +419,6 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) body = g_strdup_printf (_("Call from %s"), tpl_entity_get_alias (tpl_event_get_sender (logevent))); } -#endif else { /* Unknown event type */ return NULL; |