Merge lp:~larsu/unity8/per-profile-indicator-positions into lp:unity8

[Lars Karlitski]

Allow setting different indicator positions for different profiles

Allow setting different indicator positions for different profiles

The order of the indicators is different on the phone [1] and on the desktop [2].

[1] https://wiki.ubuntu.com/StatusBar
[2] https://wiki.ubuntu.com/MenuBar#System_status_menus_.28system_indicators.29

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/unity8-ci/1357/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2803/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/797/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2805/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1357/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

menuObjectPaths is used by IndicatorBase in the Indicators plugin to get the path. It's implicitly set by iterating over all the properties in the map.

I have a feeling we may need to support multiple profiles in the shell ("greeter" vs "phone") at some point. Maybe the profile should be a property on the IndicatorsModel.
But I guess this is OK for now, as long as the IndicatorBase issue is fixed.

[Nick Dedekind (nick-dedekind)]

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> menuObjectPaths is used by IndicatorBase in the Indicators plugin to get the
> path. It's implicitly set by iterating over all the properties in the map.
>
> I have a feeling we may need to support multiple profiles in the shell
> ("greeter" vs "phone") at some point. Maybe the profile should be a property
> on the IndicatorsModel.
> But I guess this is OK for now, as long as the IndicatorBase issue is fixed.

my bad. i'm blind

[Nick Dedekind (nick-dedekind)]

Needs changing here as well.

http://bazaar.launchpad.net/~larsu/unity8/per-profile-indicator-positions/view/head:/Panel/Indicators/client/IndicatorsTree.qml#L35

review: Needs Fixing

[Lars Karlitski (larsu)]

Thanks for having a look. I fixed that place and also the test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:415
http://jenkins.qa.ubuntu.com/job/unity8-ci/1379/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4965
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1379
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/840
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/840/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2875/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2388
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2428

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1379/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/701/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3237/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/87
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/87
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/776
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/776/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3391
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1481

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/715/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/3259
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/822
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/101
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/101
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/834
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3430
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1519

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/724/
Executed test runs:
    None: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3301/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/868
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/110
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/880
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/880/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/868
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3469
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1558

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/732/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/896
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/879/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/118
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/896
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/879
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/879/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3481/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1570

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/739/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3343
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/921
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/905/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/125
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/921
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/905
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/905/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3504/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1594

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/744/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/935
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/919/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/130
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/919/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3515/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1607

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/756/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/984
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/968/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/142
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/984
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/984/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/968
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/968/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3560/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1663

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/Indicators/client/IndicatorsTree.qml'
--- Panel/Indicators/client/IndicatorsTree.qml	2013-10-02 09:38:06 +0000
+++ Panel/Indicators/client/IndicatorsTree.qml	2013-10-11 20:22:29 +0000
@@ -29,10 +29,9 @@
 
     property string busName: unityModel.busName
     property string actionsObjectPath
-    property var menuObjectPaths: undefined
-    readonly property string device: "phone"
+    property string menuObjectPath
 
-    property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
+    property string deviceMenuObjectPath: menuObjectPath
 
     function start() {
     }

=== modified file 'plugins/Unity/Indicators/indicator.cpp'
--- plugins/Unity/Indicators/indicator.cpp	2013-09-02 07:39:53 +0000
+++ plugins/Unity/Indicators/indicator.cpp	2013-10-11 20:22:29 +0000
@@ -31,32 +31,24 @@
 {
 }
 
-void Indicator::init(const QString& busName, const QSettings& settings)
+void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)
 {
     setId(settings.value("Indicator Service/Name").toString());
-    setPosition(settings.value("Indicator Service/Position", QVariant::fromValue(0)).toInt());
+
+    QVariant pos = settings.value(profile + "/Position");
+    if (!pos.isValid())
+        pos = settings.value("Indicator Service/Position", QVariant::fromValue(0));
+    setPosition(pos.toInt());
 
     QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
-
-    QVariantMap mapMenuObjectPaths;
-    Q_FOREACH(const QString& childGroup, settings.childGroups())
-    {
-        if (childGroup == "Indicator Service")
-            continue;
-
-        QString menuPath = childGroup+"/ObjectPath";
-        if (settings.contains(menuPath))
-        {
-            mapMenuObjectPaths[childGroup] = settings.value(menuPath).toString();
-        }
-    }
+    QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();
 
     QVariantMap properties;
     properties.clear();
     properties.insert("busType", 1);
     properties.insert("busName", busName);
     properties.insert("actionsObjectPath", actionObjectPath);
-    properties.insert("menuObjectPaths", mapMenuObjectPaths);
+    properties.insert("menuObjectPath", menuObjectPath);
     setIndicatorProperties(properties);
 }
 

=== modified file 'plugins/Unity/Indicators/indicator.h'
--- plugins/Unity/Indicators/indicator.h	2013-09-02 07:39:53 +0000
+++ plugins/Unity/Indicators/indicator.h	2013-10-11 20:22:29 +0000
@@ -35,7 +35,7 @@
     Indicator(QObject *parent = 0);
     virtual ~Indicator();
 
-    void init(const QString& busName, const QSettings& settings);
+    void init(const QString &profile, const QString& busName, const QSettings& settings);
 
     QString identifier() const;
     int position() const;

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2013-10-10 18:00:54 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2013-10-11 20:22:29 +0000
@@ -26,6 +26,8 @@
 
 #include "paths.h"
 
+const QString profile = "phone";
+
 
 class IndicatorsManager::IndicatorData
 {
@@ -298,7 +300,7 @@
     Indicator::Ptr new_indicator(new Indicator(this));
     data->m_indicator = new_indicator;
     QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
-    new_indicator->init(data->m_fileInfo.fileName(), settings);
+    new_indicator->init(profile, data->m_fileInfo.fileName(), settings);
     return new_indicator;
 }
 

=== modified file 'plugins/Unity/Indicators/qml/IndicatorBase.qml'
--- plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-09-30 16:37:55 +0000
+++ plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-10-11 20:22:29 +0000
@@ -24,16 +24,15 @@
 Item {
     id: indicatorItem
 
-    enabled: menuObjectPaths.hasOwnProperty(device)
+    enabled: menuObjectPath != ""
 
     //const
     property string busName
     property string actionsObjectPath
-    property var menuObjectPaths: undefined
-    readonly property string device: "phone"
+    property string menuObjectPath
     property string rootMenuType: "com.canonical.indicator.root"
 
-    property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
+    property string deviceMenuObjectPath: menuObjectPath
 
     property alias menuModel: cachedModel.model
 

=== modified file 'tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp'
--- tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp	2013-08-14 09:07:45 +0000
+++ tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp	2013-10-11 20:22:29 +0000
@@ -80,9 +80,7 @@
         QCOMPARE(props["busName"].toString(), QString("com.canonical.indicator.fake1"));
         QCOMPARE(props["actionsObjectPath"].toString(), QString("/com/canonical/indicator/fake1"));
 
-        QVariantMap objectPaths = props["menuObjectPaths"].toMap();
-        QCOMPARE(objectPaths["phone"].toString(), QString("/com/canonical/indicator/fake1/phone"));
-        QCOMPARE(objectPaths["desktop"].toString(), QString("/com/canonical/indicator/fake1/desktop"));
+        QCOMPARE(props["menuObjectPath"].toString(), QString("/com/canonical/indicator/fake1/phone"));
     }
 
     /*