aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-04-27 04:02:32 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-04-27 04:02:32 +0800
commit4105981fd4140b91fa23ddc424f5ab2389f635a8 (patch)
treedbddc7af194f38506ec90c07c81f22c5b1b42c80
parent0566ba432cb7c9b7149edd2f5adde38263456d7f (diff)
downloadgsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar.gz
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar.bz2
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar.lz
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar.xz
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.tar.zst
gsoc2013-empathy-4105981fd4140b91fa23ddc424f5ab2389f635a8.zip
LogWindow: Display /me messages properly
-rw-r--r--libempathy-gtk/empathy-log-window.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index b6296edeb..db13328ef 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -710,10 +710,20 @@ log_window_append_chat_message (TplEvent *event,
get_parent_iter_for_message (event, message, &parent);
- body = g_strdup_printf (
- C_("First is a contact, second is what he said", "%s: %s"),
- tpl_entity_get_alias (tpl_event_get_sender (event)),
- empathy_message_get_body (message));
+ if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event))
+ == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION)
+ {
+ body = g_strdup_printf ("* %s %s",
+ tpl_entity_get_alias (tpl_event_get_sender (event)),
+ empathy_message_get_body (message));
+ }
+ else
+ {
+ body = g_strdup_printf (
+ C_("First is a contact, second is what he said", "%s: %s"),
+ tpl_entity_get_alias (tpl_event_get_sender (event)),
+ empathy_message_get_body (message));
+ }
gtk_tree_store_append (store, &iter, &parent);
gtk_tree_store_set (store, &iter,