aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-theme-adium.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-24 16:31:55 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-24 16:31:55 +0800
commit15a4eec2f156c4f60398a9d842279203f475ed89 (patch)
tree5915a4311c719acbbc0342faa31c648f0dbcc0b7 /libempathy-gtk/empathy-theme-adium.c
parent27831472d751867c3f2ff1f4f26087c75c65776b (diff)
downloadgsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar.gz
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar.bz2
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar.lz
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar.xz
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.tar.zst
gsoc2013-empathy-15a4eec2f156c4f60398a9d842279203f475ed89.zip
theme-adium: escape the name in actions as well
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
-rw-r--r--libempathy-gtk/empathy-theme-adium.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 66b03205d..7b0cd2169 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,