Merge lp:~fboucault/unity-2d/remove_unused_dash_dbus_props into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Florian Boucault]

Removed DashClient.activePage() getter, setActivePage() setter and activePageChanged signal

[Albert Astals Cid (aacid)]

Isn't this a bit too much aggressive? The fact that we don't use them doesn't mean that they don't make sense. Having the possibility of setting the lens via dbus is nice if you want to do a script that does some stuff for example

[Florian Boucault (fboucault)]

You may be right. I am unsure.
For DashClient though, I'd rather get rid of it.

[Albert Astals Cid (aacid)]

I'm fine removing the stuff from DashClient, but the dbus API i'd like to keep.

I like to think of dbus api as public library API since basically it's there for all to use, removing or changing it without reason is just hurting people that might be using them.

[lp:~fboucault/unity-2d/remove_unused_dash_dbus_props]

993. By Florian Boucault on 2012-02-09

Reverted removal of dash's D-Bus properties, methods and signals.

[Albert Astals Cid (aacid)]

Ok, remove dead code

review: Approve

=== modified file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	2012-02-07 16:48:45 +0000
+++ libunity-2d-private/src/dashclient.cpp	2012-02-09 11:10:58 +0000
@@ -87,8 +87,6 @@
                                          QDBusConnection::sessionBus(), this);
     connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
             SLOT(slotDashActiveChanged(bool)));
-    connect(m_dashDbusIface, SIGNAL(activeLensChanged(const QString&)),
-            SLOT(slotDashActiveLensChanged(const QString&)));
 
     QVariant value = m_dashDbusIface->property("active");
     if (value.isValid()) {
@@ -96,14 +94,6 @@
     } else {
         UQ_WARNING << "Fetching Dash.active property failed";
     }
-    value = m_dashDbusIface->property("activeLens");
-    if (value.isValid()) {
-        m_dashActiveLens = value.toString();
-    } else {
-        UQ_WARNING << "Fetching Dash.activeLens property failed";
-    }
-
-    updateActivePage();
 }
 
 DashClient* DashClient::instance()
@@ -116,19 +106,10 @@
 {
     if (m_dashActive != value) {
         m_dashActive = value;
-        updateActivePage();
     }
     Q_EMIT activeChanged(value);
 }
 
-void DashClient::slotDashActiveLensChanged(const QString& lens)
-{
-    if (m_dashActiveLens != lens) {
-        m_dashActiveLens = lens;
-        updateActivePage();
-    }
-}
-
 bool DashClient::active() const
 {
     return m_dashActive;
@@ -147,43 +128,6 @@
     }
 }
 
-QString DashClient::activePage() const
-{
-    return m_activePage;
-}
-
-void DashClient::setActivePage(const QString& page, const QString& lensId)
-{
-    if (m_activePage == page) {
-        return;
-    }
-    if (page.isEmpty()) {
-        setActive(false);
-        return;
-    }
-    // Use a separate QDBusInterface so that the dash is started if it is not
-    // already running
-    QDBusInterface iface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    if (page == "home") {
-        iface.asyncCall("activateHome");
-    } else {
-        iface.asyncCall("activateLens", lensId);
-    }
-}
-
-void DashClient::updateActivePage()
-{
-    QString activePage;
-    if (m_dashActive) {
-        activePage = m_dashActiveLens.isEmpty() ? "home" : m_dashActiveLens;
-    }
-
-    if (m_activePage != activePage) {
-        m_activePage = activePage;
-        activePageChanged(m_activePage);
-    }
-}
-
 QSize DashClient::minimumSizeForDesktop()
 {
     return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
 
=== modified file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	2012-02-07 16:48:45 +0000
+++ libunity-2d-private/src/dashclient.h	2012-02-09 11:10:58 +0000
@@ -44,36 +44,23 @@
     bool active() const;
     void setActive(bool active);
 
-    /**
-     * Returns the active page. This is either:
-     * - The lens id of the active lens
-     * - "home" if the home is visible
-     * - "" if the dash is not visible
-     */
-    QString activePage() const;
     bool alwaysFullScreen() const;
-    void setActivePage(const QString& page, const QString& lensId=QString());
     static QSize minimumSizeForDesktop();
 
 Q_SIGNALS:
     void activeChanged(bool);
-    void activePageChanged(const QString&);
     void alwaysFullScreenChanged();
 
 private Q_SLOTS:
     void connectToDash();
     void slotDashActiveChanged(bool);
-    void slotDashActiveLensChanged(const QString&);
     void updateAlwaysFullScreen();
 
 private:
     DashClient(QObject* parent = 0);
-    void updateActivePage();
 
     QDBusInterface* m_dashDbusIface;
     bool m_dashActive;
-    QString m_dashActiveLens;
-    QString m_activePage;
     bool m_alwaysFullScreen;
 };