ui: new function to safely display values in labels

sonata/main.py

@@ -1047,7 +1047,7 @@ def populate_profiles_for_menu(self):
         profile_names = [_("MPD_HOST/PORT")] if host \
                 or port else self.config.profile_names
         actions = [(str(i), None,
-            "[%s] %s" % (i + 1, name.replace("_", "__")), None,
+            "[%s] %s" % (i + 1, ui.quote_label(name)), None,
             None, i)
             for i, name in enumerate(profile_names)]
         actions.append(('disconnect', None, _('Disconnect'), None, None,

sonata/playlists.py

@@ -103,7 +103,7 @@ def populate_playlists_for_menu(self, playlistinfo):
         self.UIManager().ensure_update()
         actions = [("Playlist: %s" % playlist.replace("&", ""),
                 gtk.STOCK_JUSTIFY_CENTER,
-                misc.unescape_html(playlist).replace("_", "__"),
+                ui.quote_label(misc.unescape_html(playlist)),
                 None, None,
                 self.on_playlist_menu_click)
                 for playlist in playlistinfo]

sonata/ui.py

@@ -231,6 +231,14 @@ def hide(widget):
 def focus(widget):
     widget.grab_focus()
 
+def quote_label(label_value):
+    """Quote the content of a label so that it's safe to display."""
+
+    # Don't inadvertently create accelerators if the value contains a "_"
+    result = label_value.replace("_", "__")
+
+    return result
+
 def set_widths_equal(widgets):
     # Assigns the same width to all passed widgets in the list, where
     # the width is the maximum width across widgets.