From c5bdf5fd8752733fe3ba085c58fff2f525d9243c Mon Sep 17 00:00:00 2001
From: Romain B <skunnyk@alteroot.org>
Date: Fri, 1 Dec 2017 17:47:31 +0100
Subject: [PATCH] This allows to properly show some characters, such as
 ampersand.

- This fix xfce_dialog_show_warning, xfce_dialog_show_info, xfce_dialog_show_info et
- Broken since gtk3
- Fix bug #12715
---
 libxfce4ui/xfce-dialogs.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index cf402f9..c57feda 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -587,9 +587,13 @@ xfce_message_dialog_new_valist (GtkWindow   *parent,
 
   if (primary_text != NULL)
     {
+      gchar      *escaped_text;
+      /* escape ampersand symbols, etc. (bug #12715) */
+      escaped_text = g_markup_escape_text (primary_text, -1);
+
       /* Add a top line of large bold text */
       GtkWidget *primary_label = gtk_label_new (NULL);
-      gchar *markedup_text = g_strdup_printf ("<span weight='bold' size='large'>%s</span>", primary_text);
+      gchar *markedup_text = g_strdup_printf ("<span weight='bold' size='large'>%s</span>", escaped_text);
 
       gtk_label_set_markup (GTK_LABEL (primary_label), markedup_text);
       gtk_label_set_xalign (GTK_LABEL (primary_label), 0);
@@ -599,6 +603,7 @@ xfce_message_dialog_new_valist (GtkWindow   *parent,
       gtk_container_add (GTK_CONTAINER (label_box), primary_label);
       gtk_widget_show (primary_label);
 
+      g_free (escaped_text);
       g_free (markedup_text);
     }
 
-- 
2.15.0