Merge lp:~osomon/unity-2d/escapeAmpersandsPartII into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Escape ampersands in place entry section names so that they are not considered as keyboard accelerators.

[Ugo Riboni (uriboni)]

Works and code is ok. Good fix

review: Approve

=== modified file 'launcher/UnityApplications/placeentry.cpp'
--- launcher/UnityApplications/placeentry.cpp	2011-03-10 11:01:04 +0000
+++ launcher/UnityApplications/placeentry.cpp	2011-03-11 10:10:31 +0000
@@ -797,7 +797,10 @@
 
     for (int i = 0; i < m_sections->rowCount(); ++i) {
         QAction* section = new QAction(m_menu);
-        section->setText(m_sections->data(m_sections->index(i)).toString());
+        QString sectionName = m_sections->data(m_sections->index(i)).toString();
+        /* Escape ampersands so that they are not considered as keyboard accelerators. */
+        sectionName.replace("&", "&&");
+        section->setText(sectionName);
         section->setProperty(SECTION_PROPERTY, QVariant(i));
         m_menu->addAction(section);
         QObject::connect(section, SIGNAL(triggered()), this, SLOT(onSectionTriggered()));