From feed7ac396f05b9750f1181327cbe6ed14fdfe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 17 Oct 2016 16:18:01 +0200 Subject: [PATCH] fix networkmanager device type --- debian/control | 6 ++++-- server/networkmanager/networkdevice.cpp | 2 +- server/networkmanager/networkmanager.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 251b24ec..4b9f56d4 100644 --- a/debian/control +++ b/debian/control @@ -58,7 +58,9 @@ Depends: libqt5network5, libguh1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: guh-webinterface, guh-cli +Recommends: guh-webinterface, + guh-cli, + network-manager Description: An open source IoT server - daemon The guh daemon is a plugin based IoT (Internet of Things) server. The server works like a translator for devices, things and services and @@ -120,7 +122,7 @@ Architecture: any Depends: guh (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description:Tests and mock plugin for the guh daemon - tests +Description: Tests and mock plugin for the guh daemon - tests The guh daemon is a plugin based IoT (Internet of Things) server. The server works like a translator for devices, things and services and allows them to interact. diff --git a/server/networkmanager/networkdevice.cpp b/server/networkmanager/networkdevice.cpp index 6fcce5a9..6f01b800 100644 --- a/server/networkmanager/networkdevice.cpp +++ b/server/networkmanager/networkdevice.cpp @@ -57,7 +57,7 @@ NetworkDevice::NetworkDevice(const QDBusObjectPath &objectPath, QObject *parent) m_autoconnect = m_networkDeviceInterface->property("Autoconnect").toBool(); m_deviceState = NetworkDeviceState(m_networkDeviceInterface->property("State").toUInt()); - m_deviceType = NetworkDeviceType(m_networkDeviceInterface->property("NetworkDeviceType").toUInt()); + m_deviceType = NetworkDeviceType(m_networkDeviceInterface->property("DeviceType").toUInt()); m_activeConnection = qdbus_cast(m_networkDeviceInterface->property("ActiveConnection")); m_ip4Config = qdbus_cast(m_networkDeviceInterface->property("Ip4Config")); diff --git a/server/networkmanager/networkmanager.cpp b/server/networkmanager/networkmanager.cpp index 8475060f..b0dcdd32 100644 --- a/server/networkmanager/networkmanager.cpp +++ b/server/networkmanager/networkmanager.cpp @@ -317,7 +317,7 @@ void NetworkManager::onDeviceAdded(const QDBusObjectPath &deviceObjectPath) } // Create object - NetworkDevice::NetworkDeviceType deviceType = NetworkDevice::NetworkDeviceType(networkDeviceInterface.property("NetworkDeviceType").toUInt()); + NetworkDevice::NetworkDeviceType deviceType = NetworkDevice::NetworkDeviceType(networkDeviceInterface.property("DeviceType").toUInt()); switch (deviceType) { case NetworkDevice::NetworkDeviceTypeWifi: { WirelessNetworkDevice *wirelessNetworkDevice = new WirelessNetworkDevice(deviceObjectPath, this);