diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 14:43:27 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 14:44:27 +0200 |
| commit | 7e2db943e0c9a6f5764504460e64ffec9bb87d67 (patch) | |
| tree | b66779dec45f993360701e0322734cf40a9c41b0 | |
| parent | 460aeb4236d18d2b4d6486e16d1aa725b5a696fd (diff) | |
Revert "log-window: escape the body of the message"
This commit introduced a nasty regression breaking UTF-8 logs (#692746).
I prefer to revert it as #691085 was a far less anoying bug.
We'll re-fix #691085 once we'll have a UTF-8 friendly escape function in GLib
(#89548).
This reverts commit 1e7449f5a14e2f031389808206c9991f65d3ade7.
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 80733da1..cba8ae2c 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1248,7 +1248,6 @@ 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; @@ -1272,23 +1271,19 @@ 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 (_("<i>* %s %s</i>"), alias, msg_escaped); + body = g_strdup_printf (_("<i>* %s %s</i>"), alias, msg->str); } else { /* Translators: this is a message: 'Danielle: hello' * The string in bold is the sender's name */ - body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg_escaped); + body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg->str); } - 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), |