From 1e7449f5a14e2f031389808206c9991f65d3ade7 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 4 Jan 2013 16:08:39 +0100 Subject: [PATCH] log-window: escape the body of the message https://bugzilla.gnome.org/show_bug.cgi?id=691085 --- libempathy-gtk/empathy-log-window.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 6a244f50..3bc2967f 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1259,6 +1259,7 @@ log_window_append_chat_message (TplEvent *event, GtkTreeStore *store = log_window->priv->store_events; GtkTreeIter iter, parent; gchar *pretty_date, *alias, *body; + gchar *msg_escaped; GDateTime *date; EmpathyStringParser *parsers; GString *msg; @@ -1282,19 +1283,23 @@ log_window_append_chat_message (TplEvent *event, empathy_string_parser_substr (empathy_message_get_body (message), -1, parsers, msg); + msg_escaped = g_strescape (msg->str, NULL); + if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event)) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { /* Translators: this is an emote: '* Danielle waves' */ - body = g_strdup_printf (_("* %s %s"), alias, msg->str); + body = g_strdup_printf (_("* %s %s"), alias, msg_escaped); } else { /* Translators: this is a message: 'Danielle: hello' * The string in bold is the sender's name */ - body = g_strdup_printf (_("%s: %s"), alias, msg->str); + body = g_strdup_printf (_("%s: %s"), alias, msg_escaped); } + g_free (msg_escaped); + gtk_tree_store_append (store, &iter, &parent); gtk_tree_store_set (store, &iter, COL_EVENTS_TS, tpl_event_get_timestamp (event), -- 2.39.2