Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1337200 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Disconnect from upower on suspend and connect on resume

Disconnect from upower on suspend and connect on resume

[lp:~ken-vandine/ubuntu-system-settings/rtm-lp1337200]

937. By Ken VanDine on 2014-11-13

Moved up_client_enumerate_devices_sync to the constructor, we only need to call it once.

[Sebastien Bacher (seb128)]

Thanks, but see the merge request for the version in trunk. It would maybe make sense to wait to have the trunk work approved before putting up a backport for review, this way we avoid having to track "needs fixing" on different pages?

review: Needs Fixing

[Iain Lane (laney)]

Let's keep comments on https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/lp1337200/+merge/241747

[Ken VanDine (ken-vandine)]

I just needed a MP to use to build for rtm in a silo.

review: Disapprove

Unmerged revisions

937. By Ken VanDine on 2014-11-13

Moved up_client_enumerate_devices_sync to the constructor, we only need to call it once.

936. By Ken VanDine on 2014-11-13

Disconnect from upower on suspend and connect on resume

=== modified file 'plugins/battery/plugin/battery-plugin.cpp'
--- plugins/battery/plugin/battery-plugin.cpp	2014-07-23 13:37:06 +0000
+++ plugins/battery/plugin/battery-plugin.cpp	2014-11-13 23:11:19 +0000
@@ -20,6 +20,7 @@
 
 #include "battery-plugin.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 #include <QStringList>
 #include <SystemSettings/ItemBase>
@@ -39,8 +40,14 @@
     ~BatteryItem();
 
 private:
+    void up_connect();
+    void up_disconnect();
     UpClient *m_client;
+    QCoreApplication *m_app;
     gulong m_addedHandler, m_removedHandler;
+
+private Q_SLOTS:
+    void onApplicationStateChanged(Qt::ApplicationState st);
 };
 
 void deviceChanged(UpClient *client,
@@ -48,41 +55,56 @@
                    gpointer user_data)
 {
     BatteryItem *item (static_cast<BatteryItem *> (user_data));
-
-    gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
-    if (!ret) {
-        item->setVisibility (false);
-    } else {
-        GPtrArray *devices = up_client_get_devices (client);
-        item->setVisibility (devices->len > 0);
-        g_ptr_array_unref (devices);
-    }
-
+    GPtrArray *devices = up_client_get_devices (client);
+    item->setVisibility (devices->len > 0);
+    g_ptr_array_unref (devices);
 }
 
 BatteryItem::BatteryItem(const QVariantMap &staticData, QObject *parent):
     ItemBase(staticData, parent),
     m_client(up_client_new()),
+    m_app(QCoreApplication::instance()),
     m_addedHandler(0),
     m_removedHandler(0)
 {
+#if !UP_CHECK_VERSION(0, 99, 0)
+    gboolean ret = up_client_enumerate_devices_sync (m_client, nullptr, nullptr);
+    if (!ret) {
+        setVisibility (false);
+    }
+#endif
+
     deviceChanged(m_client, nullptr, this);
-    m_addedHandler = g_signal_connect (m_client,
-                                      "device-added",
-                                      G_CALLBACK (::deviceChanged),
-                                      this /* user_data */);
-    m_removedHandler = g_signal_connect (m_client,
-                                        "device-removed",
-                                        G_CALLBACK (::deviceChanged),
-                                        this /* user_data */);
-}
-
-void BatteryItem::setVisibility(bool visible)
-{
-    setVisible(visible);
-}
-
-BatteryItem::~BatteryItem()
+    connect(m_app, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onApplicationStateChanged(Qt::ApplicationState)));
+    up_connect();
+}
+
+void BatteryItem::onApplicationStateChanged(Qt::ApplicationState st)
+{
+    if (st == Qt::ApplicationActive)
+        up_connect();
+    else
+        up_disconnect();
+}
+
+void BatteryItem::up_connect()
+{
+    if (!m_addedHandler) {
+        m_addedHandler = g_signal_connect (m_client,
+                                          "device-added",
+                                          G_CALLBACK (::deviceChanged),
+                                          this /* user_data */);
+    }
+
+    if (!m_removedHandler) {
+        m_removedHandler = g_signal_connect (m_client,
+                                            "device-removed",
+                                            G_CALLBACK (::deviceChanged),
+                                            this /* user_data */);
+    }
+}
+
+void BatteryItem::up_disconnect()
 {
     if (m_addedHandler) {
         g_signal_handler_disconnect (m_client, m_addedHandler);
@@ -93,7 +115,16 @@
         g_signal_handler_disconnect (m_client, m_removedHandler);
         m_removedHandler = 0;
     }
-
+}
+
+void BatteryItem::setVisibility(bool visible)
+{
+    setVisible(visible);
+}
+
+BatteryItem::~BatteryItem()
+{
+    up_disconnect();
     g_object_unref (m_client);
 }
 
@@ -102,7 +133,6 @@
 {
 }
 
-
 ItemBase *BatteryPlugin::createItem(const QVariantMap &staticData,
                                  QObject *parent)
 {