aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/e-alert.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index ac9d9652bf..7a08c30e83 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -536,22 +536,11 @@ e_alert_new_array(const gchar *tag, GPtrArray *args)
static void
e_alert_append_text_escaped (GString *out, const gchar *text)
{
- gchar c;
-
- while ((c=*text++)) {
- if (c == '<')
- g_string_append(out, "&lt;");
- else if (c == '>')
- g_string_append(out, "&gt;");
- else if (c == '"')
- g_string_append(out, "&quot;");
- else if (c == '\'')
- g_string_append(out, "&apos;");
- else if (c == '&')
- g_string_append(out, "&amp;");
- else
- g_string_append_c(out, c);
- }
+ gchar *markup;
+
+ markup = g_markup_escape_text (text, -1);
+ g_string_append (out, markup);
+ g_free (markup);
}
static void
@@ -625,7 +614,7 @@ e_alert_get_primary_text (EAlert *alert)
if (alert->priv->definition->primary) {
e_alert_format_string (formatted,
alert->priv->definition->primary,
- alert->priv->args, FALSE);
+ alert->priv->args, TRUE);
} else {
gchar *title = e_alert_get_title (alert);
g_string_append (formatted, title);