Merge lp:~nicovdw/unity/fix-for-733743 into lp:unity

[Nico van der Walt]

Fixes bug (LP #733743) where items in the Quicklist is not displayed when the text contains an ampersand e.g. 'Science & Engineering'.

[Neil J. Patel (njpatel)]

Sorry nico but I fixed this earlier in the week, but I didn't see this bug so I couldnt' assign it to myself to save you the trouble. Fwiw, the way to do it is to use g_markup_escape_text before sending the string to the quicklist label.

review: Disapprove

Unmerged revisions

950. By Nico van der Walt on 2011-03-14

Fixes LP: #733743 - Quicklist menus did not display entries that contained an ampersand.

=== modified file 'src/QuicklistMenuItemLabel.cpp'
--- src/QuicklistMenuItemLabel.cpp	2011-02-19 14:21:02 +0000
+++ src/QuicklistMenuItemLabel.cpp	2011-03-14 22:03:58 +0000
@@ -50,7 +50,11 @@
   _item_type  = MENUITEM_TYPE_LABEL;
 
   if (item)
-    _text = g_strdup (dbusmenu_menuitem_property_get (item, DBUSMENU_MENUITEM_PROP_LABEL));
+  {
+    gchar **textArray = g_strsplit (g_strdup (dbusmenu_menuitem_property_get (item, DBUSMENU_MENUITEM_PROP_LABEL)),"&",0);
+    _text = g_strjoinv ("&",textArray);
+    g_strfreev (textArray);
+  }
   else
     _text = g_strdup ("Label");