aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-04 09:27:03 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-04 09:27:03 -0500
commitd4cd4cf58651bda63f8504e81b82c535e4f97fa6 (patch)
tree17d51af1a583475a0787f75acd31a5193639e7aa /libdbusmenu-gtk
parent8093d960da6b3d32549ba3fc58f2bdb58bffa768 (diff)
parent9c77e28fb5485650e033a6cfb868785ea8f1dbad (diff)
downloadlibdbusmenu-d4cd4cf58651bda63f8504e81b82c535e4f97fa6.tar.gz
libdbusmenu-d4cd4cf58651bda63f8504e81b82c535e4f97fa6.tar.bz2
libdbusmenu-d4cd4cf58651bda63f8504e81b82c535e4f97fa6.zip
merge lp:~aacid/dbusmenu/amp_replacement to prevent menuitems containing a '&' from incorrectly showing an underscore
Diffstat (limited to 'libdbusmenu-gtk')
-rw-r--r--libdbusmenu-gtk/genericmenuitem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 75bdbbd..ae6d4c0 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -279,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: