Merge lp:~lool/qtpowerd/misc-fixes into lp:~music-app-dev/qtpowerd/trunk

[Loïc Minier]

Misc fixes allowing qtpowerd to function with music-app.

Hi there,

Misc fixes in here, but more importantly this fixes the requestSysState() and clearSysState() so that it basically works.

On the long run, I think we ought to:
* never use this from apps since some backgrond music service should do it for them
* allow for multiple locks or various types, even if apps should not take them most of the time, sometimes it makes sense; there are other reasons for bindings such as tracking display state changes (as unity8 Shell does)
* allow naming the locks (currently qtpowerd hardcodes "music-app-background")
* move this to powerd itself to provide; this would allow using the header

However I think this is good enough for music-app for 13.10 :-)

I might try to fix some of the other bits there if time allow.

I also wonder if the name Powerd 0.1 might break unity8's Powerd 0.1 plugin.

[lp:~lool/qtpowerd/misc-fixes]

17. By Loïc Minier on 2013-10-01

Rename from Powerd to QtPowerd to avoid clash with Unity8 Shell plugi.

18. By Loïc Minier on 2013-10-01

Bump to 0.2.

[Loïc Minier (lool)]

So indeed this clashed with Unity8 Shell's powerd plugin; fixed in r17/r18.

[Victor Thompson (vthompson)]

The plugin is under Ubuntu.Powerd, so I don't think it should break Unity's plugin. Changing the version to 0.2 doesn't necessary fix the issue--if it exists--however. Maybe we should rename the plugin to something directly related to "keepAlive"?

[Victor Thompson (vthompson)]

Nevermind my previous comment. I thought you bumped the version to deconflict with the Unity plugin. Renaming the plugin as you are should accomplish this.

[David Planella (dpm)]

I guess another solution would have been that we install it as a private plugin: the settings app does that for example, each panel being a private plugin installed within the app and not accessible by other applications.

So either the music app or Unity could have installed their powerd plugin privately to prevent it being picked up by other apps.

The question that comes to mind is: could we not just have one single powerd plugin that can be used by both Unity and the Music app?

review: Needs Information

=== renamed file 'Powerd.cpp' => 'QtPowerd.cpp'
--- Powerd.cpp	2013-09-25 23:31:51 +0000
+++ QtPowerd.cpp	2013-10-01 21:50:24 +0000
@@ -16,39 +16,66 @@
  * Author: Michael Terry <[e-mail]>
  */
 
-#include "Powerd.h"
-
-Powerd::Powerd(QObject* parent)
+#include <QtDebug>
+
+/* FIXME should really include powerd.h, but not available right now */
+//#include <powerd.h>
+enum SysPowerStates {
+    //Note that callers will be notified of suspend state changes
+    //but may not request this state.
+    POWERD_SYS_STATE_SUSPEND = 0,
+
+    //The Active state will prevent system suspend
+    POWERD_SYS_STATE_ACTIVE,
+
+    POWERD_NUM_POWER_STATES
+};
+
+#include "QtPowerd.h"
+
+// XXX this should be set by QML app; in fact it could hold multiple ones
+#define LOCK_NAME "music-app-background"
+
+QtPowerd::QtPowerd(QObject* parent)
   : QObject(parent),
-    m_powerd(NULL)
+    m_keepAlive(false),
+    m_qtpowerd(NULL)
 {
-    m_powerd = new QDBusInterface("com.canonical.powerd",
-                                "/com/canonical/powerd",
-                                "com.canonical.powerd",
-                                QDBusConnection::SM_BUSNAME(), this);
+    m_qtpowerd = new QDBusInterface("com.canonical.powerd",
+                                    "/com/canonical/powerd",
+                                    "com.canonical.powerd",
+                                    QDBusConnection::SM_BUSNAME(), this);
 }
 
-bool Powerd::keepAlive() const
+bool QtPowerd::keepAlive() const
 {
     return m_keepAlive;
 }
 
-void Powerd::setKeepAlive(bool keep)
+void QtPowerd::setKeepAlive(const bool keep)
 {
-    m_keepAlive = keep;
+    if (m_keepAlive == keep) {
+        // nothing to do
+        return;
+    }
+
     if (keep) {
-        m_cookie = m_powerd->connection().connect("com.canonical.powerd",
-                                                  "/com/canonical/powerd",
-                                                  "com.canonical.powerd",
-                                                  "RequestSysState",
-                                                  this,
-                                                  METHOD(requestSysState("music-app-background", 1)));
+        QDBusReply<QString> reply = m_qtpowerd->call("requestSysState",
+                                                     LOCK_NAME,
+                                                     POWERD_SYS_STATE_ACTIVE);
+        if (!reply.isValid()) {
+            qCritical() << "requestSysState:" << reply.error();
+            return;
+        }
+        m_cookie = reply.value();
     } else {
-        m_cookie = m_powerd->connection().connect("com.canonical.powerd",
-                                                  "/com/canonical/powerd",
-                                                  "com.canonical.powerd",
-                                                  "ClearSysState",
-                                                  this,
-                                                  METHOD(clearSysState(m_cookie)));
+        QDBusReply<void> reply = m_qtpowerd->call("clearSysState", m_cookie);
+        if (!reply.isValid()) {
+            qCritical() << "clearSysState:" << reply.error();
+            return;
+        }
     }
+
+    m_keepAlive = keep;
+    Q_EMIT keepAliveChanged();
 }
 
=== renamed file 'Powerd.h' => 'QtPowerd.h'
--- Powerd.h	2013-09-25 13:04:12 +0000
+++ QtPowerd.h	2013-10-01 21:50:24 +0000
@@ -17,26 +17,31 @@
  *          Michael Terry <[e-mail]>
  */
 
-#ifndef UBUNTU_POWERD_H
-#define UBUNTU_POWERD_H
+#ifndef QTPOWERD_H
+#define QTPOWERD_H
 
 #include <QtCore/QObject>
 #include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusReply>
 
-class Powerd: public QObject
+class QtPowerd: public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool keepAlive READ keepAlive WRITE setKeepAlive NOTIFY keepAliveChanged)
+
 public:
-    explicit Powerd(QObject *parent = 0);
+    explicit QtPowerd(QObject *parent = 0);
+
     bool keepAlive() const;
-    void setKeepAlive(bool keepAlive);
-signals:
+    void setKeepAlive(const bool keepAlive);
+
+Q_SIGNALS:
     void keepAliveChanged();
+
 private:
     QString m_cookie;
     bool m_keepAlive;
-    QDBusInterface *m_powerd;
+    QDBusInterface *m_qtpowerd;
 };
 
 #endif
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-25 13:04:12 +0000
+++ debian/changelog	2013-10-01 21:50:24 +0000
@@ -1,3 +1,9 @@
+qtpowerd (0.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * Bump to 0.2.
+
+ -- Loïc Minier <[e-mail]>  Tue, 01 Oct 2013 23:11:10 +0200
+
 qtpowerd (0.0.20130924-0ubuntu1) saucy; urgency=low
 
   * Initial release.
 
=== modified file 'plugin.cpp'
--- plugin.cpp	2013-09-26 00:12:18 +0000
+++ plugin.cpp	2013-10-01 21:50:24 +0000
@@ -18,19 +18,19 @@
  */
 
 #include "plugin.h"
-#include "Powerd.h"
+#include "QtPowerd.h"
 
 #include <QtQml/qqml.h>
 
-static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+static QObject *qtpowerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
-    return new Powerd();
+    return new QtPowerd();
 }
 
-void PowerdPlugin::registerTypes(const char *uri)
+void QtPowerdPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("Powerd"));
-    qmlRegisterSingletonType<Powerd>(uri, 0, 1, "Powerd", powerd_provider);
+    Q_ASSERT(uri == QLatin1String("QtPowerd"));
+    qmlRegisterSingletonType<QtPowerd>(uri, 0, 1, "QtPowerd", qtpowerd_provider);
 }
 
=== modified file 'plugin.h'
--- plugin.h	2013-09-25 13:04:12 +0000
+++ plugin.h	2013-10-01 21:50:24 +0000
@@ -17,13 +17,12 @@
  *          Michael Terry <[e-mail]>
  */
 
-#ifndef POWER_PLUGIN_H
-#define POWER_PLUGIN_H
+#ifndef QTPOWERD_PLUGIN_H
+#define QTPOWERD_PLUGIN_H
 
-#include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class PowerdPlugin : public QQmlExtensionPlugin
+class QtPowerdPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
=== modified file 'qmldir'
--- qmldir	2013-09-25 13:04:12 +0000
+++ qmldir	2013-10-01 21:50:24 +0000
@@ -1,3 +1,2 @@
-module Ubuntu.Powerd
-plugin qmlpowerdplugin
-typeinfo plugin.qmltypes
+module QtPowerd
+plugin qmlqtpowerdplugin
 
=== modified file 'qtpowerd.pro'
--- qtpowerd.pro	2013-09-30 14:38:19 +0000
+++ qtpowerd.pro	2013-10-01 21:50:24 +0000
@@ -5,14 +5,14 @@
 
 PKGCONFIG =
 
-TARGET = qmlpowerdplugin
-PLUGIN_IMPORT_PATH = Ubuntu/Powerd.0.1
+TARGET = qmlqtpowerdplugin
+PLUGIN_IMPORT_PATH = QtPowerd.0.1
 
-SOURCES += Powerd.cpp plugin.cpp
+SOURCES += QtPowerd.cpp plugin.cpp
 
 DEFINES += "SM_BUSNAME=systemBus"
 
-HEADERS += Powerd.h plugin.h
+HEADERS += QtPowerd.h plugin.h
 
 equals(QT_MAJOR_VERSION, 5): target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH