[empathy] theme-adium: escape the name in actions as well
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] theme-adium: escape the name in actions as well
- Date: Mon, 24 Oct 2011 08:32:05 +0000 (UTC)
commit 15a4eec2f156c4f60398a9d842279203f475ed89
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Oct 24 10:31:55 2011 +0200
theme-adium: escape the name in actions as well
libempathy-gtk/empathy-theme-adium.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 66b0320..7b0cd21 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -816,6 +816,8 @@ theme_adium_append_message (EmpathyChatView *view,
contact_id = empathy_contact_get_id (sender);
action = (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION);
+ name_escaped = g_markup_escape_text (name, -1);
+
/* If this is a /me probably */
if (action) {
gchar *str;
@@ -823,7 +825,7 @@ theme_adium_append_message (EmpathyChatView *view,
if (priv->data->version >= 4 || !priv->data->custom_template) {
str = g_strdup_printf ("<span class='actionMessageUserName'>%s</span>"
"<span class='actionMessageBody'>%s</span>",
- name, body_escaped);
+ name_escaped, body_escaped);
} else {
str = g_strdup_printf ("*%s*", body_escaped);
}
@@ -947,8 +949,6 @@ theme_adium_append_message (EmpathyChatView *view,
}
}
- name_escaped = g_markup_escape_text (name, -1);
-
theme_adium_append_html (theme, func, html, body_escaped,
avatar_filename, name_escaped, contact_id,
service_name, message_classes->str,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]