theme-adium: escape the name in actions as well
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 24 Oct 2011 08:31:55 +0000 (10:31 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 24 Oct 2011 08:31:55 +0000 (10:31 +0200)
libempathy-gtk/empathy-theme-adium.c

index 66b03205d0955bcc684eec7ed6de9735edc92e98..7b0cd21696479d134f08d6c0d0faf8b4b4e0bbf3 100644 (file)
@@ -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,