Merge lp:~ken-vandine/ubuntu-system-settings/nm_1.2_ip_address into lp:ubuntu-system-settings

[Ken VanDine]

Don't use Ip4Address from NetworkManager, it was deprecated since 0.9 and since removed. Use QNetworkInterface to get the IP address.

Don't use Ip4Address from NetworkManager, it was deprecated since 0.9 and since removed. Use QNetworkInterface to get the IP address.

[Jonas G. Drange (jonas-drange)]

Beautiful! Approval of code!

review: Approve

=== modified file 'plugins/wifi/wifidbushelper.cpp'
--- plugins/wifi/wifidbushelper.cpp	2015-06-26 11:34:48 +0000
+++ plugins/wifi/wifidbushelper.cpp	2016-05-10 18:13:53 +0000
@@ -22,6 +22,7 @@
 #include <QDBusReply>
 #include <QtDebug>
 #include <QDBusInterface>
+#include <QNetworkInterface>
 #include <algorithm>
 #include <arpa/inet.h>
 
@@ -297,33 +298,18 @@
         return QString();
     }
     auto devices = reply1.value();
-    int ip4addr;
 
-    QDBusObjectPath dev;
     for (const auto &d : devices) {
         QDBusInterface iface(NM_SERVICE, d.path(), NM_DEVICE_IFACE, m_systemBusConnection);
         auto type_v = iface.property("DeviceType");
         if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
-            ip4addr = iface.property("Ip4Address").toInt();
-            dev = d;
+            auto ip4name = iface.property("IpInterface").toString();
+            return QNetworkInterface::interfaceFromName(ip4name).addressEntries()[0].ip().toString();
             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));
+    return QString();
 }
 
 struct Network : public QObject