Merge lp:~jonas-drange/ubuntu-system-settings/show-ip-and-mac into lp:ubuntu-system-settings

[Jonas G. Drange]

[about/wifi] adding mac addresses for bt and wifi, and ip for wifi

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:947
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3453/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1322/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:949
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5435
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5435/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3461
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3461/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1326/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:951
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5493
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5493/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3491
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3491/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1342/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, I didn't do a real review but the listitem need to have their text set as translatable (e.g using i18.tr() for the strings)

review: Needs Fixing

[Sebastien Bacher (seb128)]

could you also link to the corresponding bug so it gets closed on upload?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:953
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/536
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4060/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5499
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5499/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3494/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1344/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

The title on the NetworkDetailsBrief page should be the wireless network name according to the design.

review: Needs Fixing

[lp:~jonas-drange/ubuntu-system-settings/show-ip-and-mac]

954. By Jonas G. Drange on 2014-08-29

translatable strings, naming panel network name

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:954
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1350/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4259
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3213/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/542
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5511
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5511/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12394
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3504/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1350/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:954
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5528
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3516
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3516/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1354/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Works fine, thanks

review: Approve

=== modified file 'plugins/about/CMakeLists.txt'
--- plugins/about/CMakeLists.txt	2014-07-22 20:21:24 +0000
+++ plugins/about/CMakeLists.txt	2014-08-29 18:12:46 +0000
@@ -18,8 +18,17 @@
 )
 
 add_library(UbuntuStorageAboutPanel MODULE
-plugin.cpp storageabout.cpp click.cpp plugin.h storageabout.h click.h
-${QML_SOURCES}) # So they show up in Qt designer.
+    plugin.cpp
+    storageabout.cpp
+    click.cpp
+    networkabout.cpp
+    plugin.h
+    storageabout.h
+    click.h
+    networkabout.h
+    ${QML_SOURCES} # So they show up in Qt designer.
+)
+
 qt5_use_modules(UbuntuStorageAboutPanel Qml Quick DBus)
 target_link_libraries(UbuntuStorageAboutPanel
 ${ANDR_PROP_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS})

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-08-06 13:54:52 +0000
+++ plugins/about/PageComponent.qml	2014-08-29 18:12:46 +0000
@@ -55,6 +55,10 @@
         modemPath: manager.modems[0]
     }
 
+    NetworkAbout {
+        id: network
+    }
+
     Flickable {
         id: scrollWidget
         anchors.fill: parent
@@ -118,6 +122,21 @@
                 visible: imeiNumber
             }
 
+            ListItem.SingleValue {
+                text: i18n.tr("Wi-Fi address")
+                value: network.networkMacAddresses[0]
+                visible: network.networkMacAddresses.length > 0
+                showDivider: bthwaddr.visible
+            }
+
+            ListItem.SingleValue {
+                id: bthwaddr
+                text: i18n.tr("Bluetooth address")
+                value: network.bluetoothMacAddress
+                visible: network.bluetoothMacAddress
+                showDivider: false
+            }
+
             ListItem.Divider {}
 
             ListItem.Standard {

=== added file 'plugins/about/networkabout.cpp'
--- plugins/about/networkabout.cpp	1970-01-01 00:00:00 +0000
+++ plugins/about/networkabout.cpp	2014-08-29 18:12:46 +0000
@@ -0,0 +1,95 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDebug>
+#include <QDBusReply>
+
+#include "networkabout.h"
+
+NetworkAbout::NetworkAbout(QObject *parent)
+    : QObject(parent),
+    m_systemBusConnection(QDBusConnection::systemBus())
+{
+
+    setupNetworkMacAddresses();
+    setupBluetoothMacAddress();
+}
+
+void NetworkAbout::setupNetworkMacAddresses()
+{
+    QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
+    int count = ifaces.count();
+
+    QString str = QString();
+    for(int i=0;i<count;i++)
+    {
+        QNetworkInterface iface = ifaces.at(i);
+        str = iface.hardwareAddress();
+        // add interfaces that are not loopback
+        if (!iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
+            m_networkMacAddresses << str;
+        }
+    }
+}
+
+void NetworkAbout::setupBluetoothMacAddress()
+{
+    QDBusInterface bluezManagerInterface (
+        "org.bluez",
+        "/",
+        "org.bluez.Manager",
+        m_systemBusConnection,
+        this);
+
+    if (!bluezManagerInterface.isValid()) {
+        return;
+    }
+
+    QDBusReply<QDBusObjectPath> defaultDevice = bluezManagerInterface.call("DefaultAdapter");
+
+    if (!defaultDevice.isValid()) {
+        return;
+    }
+
+    QDBusInterface adapterInterface (
+        "org.bluez",
+        defaultDevice.value().path(),
+        "org.bluez.Adapter",
+        m_systemBusConnection,
+        this);
+
+    QDBusReply<QVariantMap> props = adapterInterface.call("GetProperties");
+
+    if (!props.isValid()) {
+        return;
+    }
+
+    m_bluetoothMacAddress = props.value()["Address"].toString();
+}
+
+QStringList NetworkAbout::networkMacAddresses()
+{
+    return m_networkMacAddresses;
+}
+
+QString NetworkAbout::bluetoothMacAddress()
+{
+    return m_bluetoothMacAddress;
+}

=== added file 'plugins/about/networkabout.h'
--- plugins/about/networkabout.h	1970-01-01 00:00:00 +0000
+++ plugins/about/networkabout.h	2014-08-29 18:12:46 +0000
@@ -0,0 +1,57 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NETWORKABOUT_H
+#define NETWORKABOUT_H
+
+#include <QObject>
+#include <QStringList>
+#include <QtNetwork>
+#include <QtDBus/QDBusInterface>
+
+
+class NetworkAbout : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY( QStringList networkMacAddresses
+                READ networkMacAddresses
+                NOTIFY networkMacAddressesChanged )
+    Q_PROPERTY( QString bluetoothMacAddress
+                READ bluetoothMacAddress
+                NOTIFY bluetoothMacAddressChanged )
+
+public:
+    explicit NetworkAbout (QObject *parent = 0);
+    QStringList networkMacAddresses();
+    QString bluetoothMacAddress();
+
+Q_SIGNALS:
+    void networkMacAddressesChanged(QStringList addresses);
+    void bluetoothMacAddressChanged(QString addresses);
+
+private:
+    QStringList m_networkMacAddresses;
+    QString m_bluetoothMacAddress;
+    void setupNetworkMacAddresses();
+    void setupBluetoothMacAddress();
+    QDBusConnection m_systemBusConnection;
+};
+
+#endif // NETWORKABOUT_H

=== modified file 'plugins/about/plugin.cpp'
--- plugins/about/plugin.cpp	2014-07-23 13:37:06 +0000
+++ plugins/about/plugin.cpp	2014-08-29 18:12:46 +0000
@@ -23,14 +23,16 @@
 #include <QtQml/QQmlContext>
 #include "click.h"
 #include "storageabout.h"
+#include "networkabout.h"
 
 
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.StorageAbout"));
-    
+
     qRegisterMetaType<ClickModel::Roles>();
     qmlRegisterType<ClickModel>(uri, 1, 0, "ClickRoles");
+    qmlRegisterType<NetworkAbout>(uri, 1, 0, "NetworkAbout");
     qmlRegisterType<StorageAbout>(uri, 1, 0, "UbuntuStorageAboutPanel");
 }
 

=== modified file 'plugins/wifi/AccessPoint.qml'
--- plugins/wifi/AccessPoint.qml	2013-11-28 15:09:15 +0000
+++ plugins/wifi/AccessPoint.qml	2014-08-29 18:12:46 +0000
@@ -34,6 +34,11 @@
     onCheckedChanged: {
         // Can't rely on binding. Checked is assigned on click.
         checkBoxActive.checked = checked;
+
+        // if stack has NetworkDetailsBrief, pop it
+        if (pageStack.depth === 3) {
+            pageStack.pop();
+        }
     }
 
     iconName: {
@@ -65,4 +70,11 @@
             accessPoint.activate();
         }
     }
+    progression: checked
+    onClicked: {
+        if (checked) {
+            pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"),
+            {networkName : text, accessPoint: accessPoint})
+        }
+    }
 }

=== modified file 'plugins/wifi/CMakeLists.txt'
--- plugins/wifi/CMakeLists.txt	2014-06-18 14:16:53 +0000
+++ plugins/wifi/CMakeLists.txt	2014-08-29 18:12:46 +0000
@@ -7,6 +7,7 @@
 IndicatorBase.qml
 MenuItemFactory.qml
 NetworkDetails.qml
+NetworkDetailsBrief.qml
 OtherNetwork.qml
 PageComponent.qml
 PreviousNetworks.qml

=== added file 'plugins/wifi/NetworkDetailsBrief.qml'
--- plugins/wifi/NetworkDetailsBrief.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/NetworkDetailsBrief.qml	2014-08-29 18:12:46 +0000
@@ -0,0 +1,79 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.Wifi 1.0
+
+ItemPage {
+
+    property string networkName
+    property var accessPoint
+
+    title: networkName
+
+    Column {
+
+        anchors.fill: parent
+
+        ListItem.Divider {}
+
+        Button {
+            text : i18n.tr("Disconnect")
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(2)
+            }
+            onClicked: {
+                if (DbusHelper.deactivateConnection()) {
+                    accessPoint.checked = false;
+                    accessPoint.checkedChanged(false)
+                }
+
+            }
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("IP address")
+            id: addressItem
+            control: TextField {
+                text: DbusHelper.wifiIp4Address
+                readOnly: true
+                horizontalAlignment: TextInput.AlignRight
+                width: addressItem.width/2
+                persistentSelection: true
+                font.pixelSize: units.dp(16)
+                font.weight: Font.Light
+                font.family: "Ubuntu"
+                color: "#AAAAAA"
+                maximumLength: 20
+                focus: true
+                clip: true
+                opacity: 0.9
+                cursorVisible: false
+                hasClearButton: false
+            }
+        }
+    }
+}

=== modified file 'plugins/wifi/wifidbushelper.cpp'
--- plugins/wifi/wifidbushelper.cpp	2014-07-23 13:53:48 +0000
+++ plugins/wifi/wifidbushelper.cpp	2014-08-29 18:12:46 +0000
@@ -23,15 +23,20 @@
 #include <QtDebug>
 #include <QDBusInterface>
 #include <algorithm>
+#include <arpa/inet.h>
 
 #include "nm_manager_proxy.h"
 #include "nm_settings_proxy.h"
 #include "nm_settings_connection_proxy.h"
 
+#define NM_SERVICE "org.freedesktop.NetworkManager"
+#define NM_PATH "/org/freedesktop/NetworkManager"
+
 typedef QMap<QString,QVariantMap> ConfigurationData;
 Q_DECLARE_METATYPE(ConfigurationData)
 
-WifiDbusHelper::WifiDbusHelper(QObject *parent) : QObject(parent)
+WifiDbusHelper::WifiDbusHelper(QObject *parent) : QObject(parent),
+      m_systemBusConnection(QDBusConnection::systemBus())
 {
     qDBusRegisterMetaType<ConfigurationData>();
 }
@@ -43,9 +48,9 @@
         return;
     }
 
-    OrgFreedesktopNetworkManagerInterface mgr("org.freedesktop.NetworkManager",
-                                              "/org/freedesktop/NetworkManager",
-                                              QDBusConnection::systemBus());
+    OrgFreedesktopNetworkManagerInterface mgr(NM_SERVICE,
+                                              NM_PATH,
+                                              m_systemBusConnection);
 
     QMap<QString, QVariantMap> configuration;
 
@@ -115,6 +120,53 @@
                                                tmp);
 }
 
+QString WifiDbusHelper::getWifiIpAddress()
+{
+    OrgFreedesktopNetworkManagerInterface mgr(NM_SERVICE,
+                                              NM_PATH,
+                                              m_systemBusConnection);
+
+    // find the first wlan adapter for now
+    auto reply1 = mgr.GetDevices();
+    reply1.waitForFinished();
+    if(!reply1.isValid()) {
+        qWarning() << "Could not get network device: " << reply1.error().message() << "\n";
+        return QString();
+    }
+    auto devices = reply1.value();
+    int ip4addr;
+
+    QDBusObjectPath dev;
+    for (const auto &d : devices) {
+        QDBusInterface iface("org.freedesktop.NetworkManager",
+                             d.path(),
+                             "org.freedesktop.NetworkManager.Device",
+                             m_systemBusConnection);
+
+        auto type_v = iface.property("DeviceType");
+        if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
+            ip4addr = iface.property("Ip4Address").toInt();
+            dev = d;
+            break;
+        }
+    }
+
+    if (dev.path().isEmpty()) {
+        // didn't find a wifi device
+        return QString();
+    }
+
+    if (!ip4addr) {
+        // no ip address
+        return QString();
+    }
+
+
+    struct in_addr ip_addr;
+    ip_addr.s_addr = ip4addr;
+    return QString(inet_ntoa(ip_addr));
+}
+
 struct Network : public QObject
 {
     struct DontCare : public std::exception {};
@@ -316,3 +368,51 @@
         qWarning() << "Error forgetting network: " << reply.error().message() << "\n";
     }
 }
+
+bool WifiDbusHelper::deactivateConnection() {
+    OrgFreedesktopNetworkManagerInterface mgr(NM_SERVICE,
+                                              NM_PATH,
+                                              m_systemBusConnection);
+    // find the first wlan adapter for now
+    auto reply1 = mgr.GetDevices();
+    reply1.waitForFinished();
+    if(!reply1.isValid()) {
+        qWarning() << "deactivateConnection: Could not get network device: " << reply1.error().message() << "\n";
+        return false;
+    }
+    auto devices = reply1.value();
+
+    QDBusObjectPath activeConnection;
+    QDBusObjectPath dev;
+    for (const auto &d : devices) {
+        QDBusInterface iface(NM_SERVICE,
+                             d.path(),
+                             "org.freedesktop.NetworkManager.Device",
+                             m_systemBusConnection);
+
+        auto type_v = iface.property("DeviceType");
+        if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
+            activeConnection = qvariant_cast<QDBusObjectPath>(iface.property("ActiveConnection"));
+            dev = d;
+            break;
+        }
+    }
+
+    if (dev.path().isEmpty()) {
+        // didn't find a wifi device
+        return false;
+    }
+
+    if (activeConnection.path().isEmpty()) {
+        // no active connection
+        return false;
+    }
+
+    auto reply = mgr.DeactivateConnection(activeConnection);
+    reply.waitForFinished();
+    if(!reply.isValid()) {
+        qWarning() << "Error deactivating connection: " << reply.error().message() << "\n";
+        return false;
+    }
+    return true;
+}

=== modified file 'plugins/wifi/wifidbushelper.h'
--- plugins/wifi/wifidbushelper.h	2014-07-23 13:53:48 +0000
+++ plugins/wifi/wifidbushelper.h	2014-08-29 18:12:46 +0000
@@ -21,6 +21,7 @@
 #define WIFI_DBUS_HELPER
 
 #include <QObject>
+#include <QtDBus>
 
 /**
  * For sending specific dbus messages from QML.
@@ -28,6 +29,9 @@
 
 class WifiDbusHelper final : public QObject {
     Q_OBJECT
+    Q_PROPERTY( QString wifiIp4Address
+                READ getWifiIpAddress
+                NOTIFY wifiIp4AddressChanged)
 
 public:
     explicit WifiDbusHelper(QObject *parent = nullptr);
@@ -36,7 +40,14 @@
     Q_INVOKABLE void connect(QString ssid, int security, QString password);
     Q_INVOKABLE QList<QStringList> getPreviouslyConnectedWifiNetworks();
     Q_INVOKABLE void forgetConnection(const QString dbus_path);
-
+    Q_INVOKABLE bool deactivateConnection();
+
+Q_SIGNALS:
+    void wifiIp4AddressChanged(QString wifiIp4Address);
+
+private:
+    QDBusConnection m_systemBusConnection;
+    QString getWifiIpAddress();
 };