From 75bdca54d5e6838aece55c84db3fd3249a624dfb Mon Sep 17 00:00:00 2001
From: Albert Astals <albert.astals@canonical.com>
Date: Mon, 4 Jun 2012 13:18:43 +0200
Subject: Replace & with &amp; since we are using set_markup in the label

---
 libdbusmenu-gtk/genericmenuitem.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-gtk')

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 75bdbbd..ab57e86 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -262,6 +262,27 @@ sanitize_label (const gchar * in_label)
 	                               NULL); /* error */
 }
 
+/* Replace '&' with '&amp' in the label */
+static gchar *
+replace_amps (const gchar * in_label)
+{
+    static GRegex * amp_regex = NULL;
+
+    g_return_val_if_fail(in_label != NULL, NULL);
+
+    if (amp_regex == NULL) {
+        amp_regex = g_regex_new("&", 0, 0, NULL);
+    }
+
+    return g_regex_replace_literal(amp_regex,
+                                   in_label,
+                                   -1,    /* length */
+                                   0,     /* start */
+                                   "&amp;",   /* replacement */
+                                   0,     /* flags */
+                                   NULL); /* error */
+}
+
 /* Set the label on the item */
 static void
 set_label (GtkMenuItem * menu_item, const gchar * in_label)
@@ -338,11 +359,15 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label)
 		gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
 
 		if (has_mnemonic(in_label, FALSE)) {
+			gchar * amp_replaced = replace_amps (local_label);
 			gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
-			gtk_label_set_markup_with_mnemonic(labelw, local_label);
+			gtk_label_set_markup_with_mnemonic(labelw, amp_replaced);
+			g_free(amp_replaced);
 		} else {
 			gchar * sanitized = sanitize_label(local_label);
-			gtk_label_set_markup(labelw, sanitized);
+			gchar * amp_replaced = replace_amps (sanitized);
+			gtk_label_set_markup(labelw, amp_replaced);
+			g_free(amp_replaced);
 			g_free(sanitized);
 		}
 
-- 
cgit v1.2.3


From 9c77e28fb5485650e033a6cfb868785ea8f1dbad Mon Sep 17 00:00:00 2001
From: Albert Astals <albert.astals@canonical.com>
Date: Mon, 4 Jun 2012 15:29:56 +0200
Subject: Use g_markup_escape_text instead of manually trying to fix the text

---
 libdbusmenu-gtk/genericmenuitem.c | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'libdbusmenu-gtk')

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index ab57e86..ae6d4c0 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -262,27 +262,6 @@ sanitize_label (const gchar * in_label)
 	                               NULL); /* error */
 }
 
-/* Replace '&' with '&amp' in the label */
-static gchar *
-replace_amps (const gchar * in_label)
-{
-    static GRegex * amp_regex = NULL;
-
-    g_return_val_if_fail(in_label != NULL, NULL);
-
-    if (amp_regex == NULL) {
-        amp_regex = g_regex_new("&", 0, 0, NULL);
-    }
-
-    return g_regex_replace_literal(amp_regex,
-                                   in_label,
-                                   -1,    /* length */
-                                   0,     /* start */
-                                   "&amp;",   /* replacement */
-                                   0,     /* flags */
-                                   NULL); /* error */
-}
-
 /* Set the label on the item */
 static void
 set_label (GtkMenuItem * menu_item, const gchar * in_label)
@@ -300,7 +279,7 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label)
 	gchar * local_label = NULL;
 	switch (GENERICMENUITEM(menu_item)->priv->disposition) {
 	case GENERICMENUITEM_DISPOSITION_NORMAL:
-		local_label = g_strdup(in_label);
+		local_label = g_markup_escape_text(in_label, -1);
 		break;
 	case GENERICMENUITEM_DISPOSITION_INFORMATIONAL:
 	case GENERICMENUITEM_DISPOSITION_WARNING:
@@ -359,15 +338,11 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label)
 		gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
 
 		if (has_mnemonic(in_label, FALSE)) {
-			gchar * amp_replaced = replace_amps (local_label);
 			gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
-			gtk_label_set_markup_with_mnemonic(labelw, amp_replaced);
-			g_free(amp_replaced);
+			gtk_label_set_markup_with_mnemonic(labelw, local_label);
 		} else {
 			gchar * sanitized = sanitize_label(local_label);
-			gchar * amp_replaced = replace_amps (sanitized);
-			gtk_label_set_markup(labelw, amp_replaced);
-			g_free(amp_replaced);
+			gtk_label_set_markup(labelw, sanitized);
 			g_free(sanitized);
 		}
 
-- 
cgit v1.2.3