Merge lp:~pete-woods/hud/use-new-libdbusmenu into lp:hud/14.04

[Pete Woods]

Use new DBusMenu API to make dbusmenu calls sync

* 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-002/

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/hud-ci/245/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-amd64-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-i386-ci/95/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:386
http://jenkins.qa.ubuntu.com/job/hud-ci/257/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-armhf-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-trusty-i386-ci/107/console

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

review: Needs Fixing (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM. Waiting for a silo.

[Antti Kaijanmäki (kaijanmaki)]

 * Are any changes against your component pending/needed to land the MP under review in a functional state and are those called out explicitly by the submitter?
Yes.

 * Did you do exploratory testing related to the component you own with the MP changeset included?
Yes.

 * Has the submitter requested review by all the relevant teams/reviewres?
Yes.

 * If you are the reviewer owning the component the MP is against, have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-14 14:09:01 +0000
+++ debian/control	2014-03-14 14:09:01 +0000
@@ -13,7 +13,7 @@
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libdbusmenu-jsonloader-dev (>= 0.5.90),
-               libdbusmenu-qt5-dev,
+               libdbusmenu-qt5-dev (>= 0.9.3),
                libdee-dev,
                libdee-qt5-dev,
                libgirepository1.0-dev,

=== modified file 'service/DBusMenuCollector.cpp'
--- service/DBusMenuCollector.cpp	2014-02-17 16:27:22 +0000
+++ service/DBusMenuCollector.cpp	2014-03-14 14:09:01 +0000
@@ -67,7 +67,9 @@
 			SLOT(
 					WindowRegistered(uint, const QString &, const QDBusObjectPath &)));
 
-	m_menuImporter.reset(new DBusMenuImporter(m_service, m_path.path()));
+	m_menuImporter.reset(
+			new DBusMenuImporter(m_service, m_path.path(),
+					DBusMenuImporterType::SYNCHRONOUS));
 
 	CollectorToken::Ptr collectorToken(m_collectorToken);
 	if(collectorToken) {