Merge lp:~unity-api-team/hud/dbusmenu-safety-valve into lp:hud/14.04

[Pete Woods]

Make the DBusMenu safety valve actually work this time

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
  * Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
  * Yes
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
  * Yes
 * Has your component "TestPlan” been executed successfully on emulator, N4?
  * Yes
 * Has a 5 minute exploratory testing run been executed on N4?
  * Yes
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
  * N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
  * No change
 * What components might get impacted by your changes?
  * Unity7
  * Unity8
 * Have you requested review by the teams of these owning components?
  * Yes

Check List:
https://wiki.ubuntu.com/Process/Merges/Checklists/hud

Test Plan:
https://wiki.ubuntu.com/Process/Merges/TestPlan/hud

Silo:
https://launchpad.net/~ci-train-ppa-service/+archive/landing-004/

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:389
http://jenkins.qa.ubuntu.com/job/hud-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-armhf-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-i386-ci/118

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/hud-ci/268/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'service/DBusMenuCollector.cpp'
--- service/DBusMenuCollector.cpp	2014-03-26 09:00:05 +0000
+++ service/DBusMenuCollector.cpp	2014-04-01 13:16:13 +0000
@@ -23,6 +23,7 @@
 
 #include <dbusmenuimporter.h>
 #include <QMenu>
+#include <stdexcept>
 
 using namespace hud::common;
 using namespace hud::service;
@@ -95,9 +96,9 @@
 	}
 
 	if (limit == 0) {
-		qWarning() << "Hit DBusMenu safety valve for menu at" << m_service
-				<< m_path.path();
-		return;
+		QString error = "Hit DBusMenu safety valve for menu at " + m_service
+				+ " " + m_path.path();
+		throw std::logic_error(error.toStdString());
 	}
 
 	menu->aboutToShow();
@@ -121,9 +122,9 @@
 
 void DBusMenuCollector::hideMenu(QMenu *menu, unsigned int &limit) {
 	if (limit == 0) {
-		qWarning() << "Hit DBusMenu safety valve for menu at" << m_service
-				<< m_path.path();
-		return;
+		QString error = "Hit DBusMenu safety valve for menu at " + m_service
+				+ " " + m_path.path();
+		throw std::logic_error(error.toStdString());
 	}
 
 	for (int i(0); i < menu->actions().size(); ++i) {
@@ -150,8 +151,12 @@
 	}
 
 	if (collectorToken.isNull()) {
-		unsigned int limit(50);
-		openMenu(m_menuImporter->menu(), limit);
+		try {
+			unsigned int limit(50);
+			openMenu(m_menuImporter->menu(), limit);
+		} catch (std::logic_error &e) {
+			qDebug() << e.what();
+		}
 
 		if(m_menuImporter.isNull()) {
 			return QList<CollectorToken::Ptr>();
@@ -169,8 +174,12 @@
 	if(m_menuImporter.isNull()) {
 		return;
 	}
-	unsigned int limit(50);
-	hideMenu(m_menuImporter->menu(), limit);
+	try {
+		unsigned int limit(50);
+		hideMenu(m_menuImporter->menu(), limit);
+	} catch (std::logic_error &e) {
+		qDebug() << e.what();
+	}
 }
 
 void DBusMenuCollector::WindowRegistered(uint windowId, const QString &service,