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

[Ken VanDine]

[battery] don't control wifi state with libnm, use the QDBusActionGroup from indicator-network

[battery] don't control wifi state with libnm, use the QDBusActionGroup from indicator-network

[Antti Kaijanmäki (kaijanmaki)]

code LGTM.

review: Approve

=== modified file 'plugins/battery/CMakeLists.txt'
--- plugins/battery/CMakeLists.txt	2013-10-22 14:44:44 +0000
+++ plugins/battery/CMakeLists.txt	2014-11-12 19:07:19 +0000
@@ -7,11 +7,11 @@
     SleepValues.qml
 )
 
-include_directories(${GLIB_INCLUDE_DIRS} ${UPOWER_GLIB_INCLUDE_DIRS} ${LIBNM_GLIB_INCLUDE_DIRS})
+include_directories(${GLIB_INCLUDE_DIRS} ${UPOWER_GLIB_INCLUDE_DIRS})
 add_library(UbuntuBatteryPanel MODULE plugin.h battery.h plugin.cpp battery.cpp
 ${QML_SOURCES})
 qt5_use_modules(UbuntuBatteryPanel Quick Qml DBus)
-target_link_libraries(UbuntuBatteryPanel ${GLIB_LDFLAGS} ${UPOWER_GLIB_LDFLAGS} ${LIBNM_GLIB_LDFLAGS})
+target_link_libraries(UbuntuBatteryPanel ${GLIB_LDFLAGS} ${UPOWER_GLIB_LDFLAGS})
 
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Battery)
 install(TARGETS UbuntuBatteryPanel DESTINATION ${PLUG_DIR})

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2014-11-12 19:07:19 +0000
+++ plugins/battery/PageComponent.qml	2014-11-12 19:07:19 +0000
@@ -329,15 +329,30 @@
                                Qt.resolvedUrl("SleepValues.qml"),
                                { title: text, lockOnSuspend: lockOnSuspend })
             }
+
+            QDBusActionGroup {
+                id: networkActionGroup
+                busType: 1
+                busName: "com.canonical.indicator.network"
+                objectPath: "/com/canonical/indicator/network"
+                property variant enabled: action("wifi.enable")
+                Component.onCompleted: start()
+            }
+
             ListItem.Standard {
                 text: i18n.tr("Wi-Fi")
-                control: Switch {
-                    id: wifiSwitch
-                    property bool serverChecked: batteryBackend.wifiEnabled
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: batteryBackend.wifiEnabled = checked
+                control: Loader {
+                    active: networkActionGroup.enabled.state != null
+                    sourceComponent: Switch {
+                        id: wifiSwitch
+                        property bool serverChecked: networkActionGroup.enabled.state
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: networkActionGroup.enabled.activate()
+                    }
                 }
+                visible: networkActionGroup.enabled.state !== undefined
+                Component.onCompleted: clicked.connect(wifiSwitch.clicked)
             }
 
             QDBusActionGroup {

=== modified file 'plugins/battery/battery.cpp'
--- plugins/battery/battery.cpp	2014-08-28 07:22:28 +0000
+++ plugins/battery/battery.cpp	2014-11-12 19:07:19 +0000
@@ -21,18 +21,8 @@
 #include "battery.h"
 #include <glib.h>
 #include <libupower-glib/upower.h>
-#include <nm-client.h>
 #include <QtCore/QDebug>
 
-static void wireless_enabled_changed (NMDevice *device G_GNUC_UNUSED,
-                                      GParamSpec *pspec G_GNUC_UNUSED,
-                                      gpointer user_data)
-{
-    auto object = static_cast<Battery *>(user_data);
-
-    Q_EMIT (object->wifiEnabledChanged());
-}
-
 Battery::Battery(QObject *parent) :
     QObject(parent),
     m_systemBusConnection (QDBusConnection::systemBus()),
@@ -43,12 +33,6 @@
     m_deviceString("")
 {
     m_device = up_device_new();
-    m_nm_client = nm_client_new();
-
-    g_signal_connect (m_nm_client,
-                      "notify::wireless-enabled",
-                      G_CALLBACK (wireless_enabled_changed),
-                      this /* user_data */);
 
     buildDeviceString();
     getLastFullCharge();
@@ -93,17 +77,6 @@
     return m_deviceString;
 }
 
-bool Battery::getWifiEnabled()
-{
-    return nm_client_wireless_get_enabled (m_nm_client);
-}
-
-void Battery::setWifiEnabled(bool enabled)
-{
-    nm_client_wireless_set_enabled (m_nm_client, enabled);
-}
-
-
 int Battery::lastFullCharge() const
 {
     return m_lastFullCharge;
@@ -214,5 +187,4 @@
 
 Battery::~Battery() {
     g_object_unref(m_device);
-    g_object_unref(m_nm_client);
 }

=== modified file 'plugins/battery/battery.h'
--- plugins/battery/battery.h	2013-09-30 11:18:17 +0000
+++ plugins/battery/battery.h	2014-11-12 19:07:19 +0000
@@ -25,7 +25,6 @@
 #include <QObject>
 
 #include <libupower-glib/upower.h>
-#include <nm-client.h>
 
 class Battery : public QObject
 {
@@ -42,11 +41,6 @@
                 READ lastFullCharge
                 NOTIFY lastFullChargeChanged)
 
-    Q_PROPERTY( bool wifiEnabled
-                READ getWifiEnabled
-                WRITE setWifiEnabled
-                NOTIFY wifiEnabledChanged)
-
 public:
     explicit Battery(QObject *parent = 0);
     ~Battery();
@@ -54,12 +48,9 @@
     QString deviceString() const;
     int lastFullCharge() const;
     Q_INVOKABLE QVariantList getHistory(const QString &deviceString, const int timespan, const int resolution);
-    bool getWifiEnabled();
-    void setWifiEnabled(bool enabled);
 
 Q_SIGNALS:
     void lastFullChargeChanged();
-    void wifiEnabledChanged();
 
 private:
     QDBusConnection m_systemBusConnection;
@@ -69,7 +60,6 @@
     UpDevice *m_device;
     QString m_deviceString;
     int m_lastFullCharge;
-    NMClient *m_nm_client;
     void buildDeviceString();
     void getLastFullCharge();
     bool updateLastFullCharge(UpHistoryItem *item, int offset);