Merge lp:~mzanetti/unity8/fix-launcher-count-emblems into lp:unity8

[Michael Zanetti]

Fix DBusVariant conversion for launcher emblems

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1372
http://jenkins.qa.ubuntu.com/job/unity8-ci/4793/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6332/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1887
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5939/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15242

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
No, because autopilot

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
--- plugins/Unity/Launcher/dbusinterface.cpp	2014-08-29 14:24:45 +0000
+++ plugins/Unity/Launcher/dbusinterface.cpp	2014-10-30 18:53:47 +0000
@@ -183,13 +183,13 @@
         }
     } else if (message.member() == "Set") {
         if (message.arguments()[1].toString() == "count") {
-            int newCount = message.arguments()[2].toInt();
+            int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
             if (!item || newCount != item->count()) {
                 Q_EMIT countChanged(appid, newCount);
                 emitPropChangedDbus(appid, "count", QVariant(newCount));
             }
         } else if (message.arguments()[1].toString() == "countVisible") {
-            bool newVisible = message.arguments()[2].toBool();
+            bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
             if (!item || newVisible != item->countVisible()) {
                 Q_EMIT countVisibleChanged(appid, newVisible);
                 emitPropChangedDbus(appid, "countVisible", newVisible);

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-09-29 14:26:56 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-10-30 18:53:47 +0000
@@ -351,8 +351,8 @@
         QCOMPARE(map.value("countVisible").toBool(), false);
 
         // Now make it visible and set it to 55 through D-Bus
-        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", 55);
-        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", true);
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", QVariant::fromValue(QDBusVariant(55)));
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(true)));
 
         // Fetch it again using GetAll
         reply = interface.call("GetAll");