Merge remote-tracking branch 'pochu-public/log-window-619866' into empathy-skype

Conflicts:
	libempathy-gtk/empathy-log-window.c
	libempathy/empathy-message.c

1 files changed, 30 insertions, 13 deletions

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 076a10053..322fb2df9 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -26,6 +26,8 @@
 
 #include <string.h>
 
+#include <glib/gi18n-lib.h>
+
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/account-manager.h>
@@ -33,6 +35,7 @@
 #include <telepathy-logger/entity.h>
 #include <telepathy-logger/event.h>
 #include <telepathy-logger/text-event.h>
+#include <telepathy-logger/call-event.h>
 
 #include "empathy-message.h"
 #include "empathy-utils.h"
@@ -302,19 +305,33 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
 			tpl_event_get_account_path (logevent));
 	g_object_unref (acc_man);
 
-	/* TODO Currently only TplTextEvent exists as subclass of TplEvent, in
-	 * future more TplEvent will exist and EmpathyMessage should probably
-	 * be enhanced to support other types of log entries (ie TplCallEvent).
-	 *
-	 * For now we just check (simply) that we are dealing with the only supported type,
-	 * then there will be a if/then/else or switch handling all the supported
-	 * cases.
-	 */
-	if (!TPL_IS_TEXT_EVENT (logevent))
-		return NULL;
-
-	body = g_strdup (tpl_text_event_get_message (
-				TPL_TEXT_EVENT (logevent)));
+	if (TPL_IS_TEXT_EVENT (logevent)) {
+		body = g_strdup (tpl_text_event_get_message (
+			TPL_TEXT_EVENT (logevent)));
+
+		retval = empathy_message_new (body);
+
+		empathy_message_set_tptype (retval,
+			tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent)));
+		empathy_message_set_is_backlog (retval, TRUE);
+
+		g_free (body);
+	} else if (TPL_IS_CALL_EVENT (logevent)) {
+		TplCallEvent *call = TPL_CALL_EVENT (logevent);
+		if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_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)
+			body = g_strdup_printf (_("Called %s"),
+				tpl_entity_get_alias (tpl_event_get_receiver (logevent)));
+		else
+			body = g_strdup_printf (_("Call from %s"),
+				tpl_entity_get_alias (tpl_event_get_sender (logevent)));
+
+		retval = empathy_message_new (body);
+		g_free (body);
+	}
+
 	receiver = tpl_event_get_receiver (logevent);
 	sender = tpl_event_get_sender (logevent);