ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix networkmanager device type

Browse Source
This commit is contained in:
Simon Stürz 2016-10-17 16:18:01 +02:00 committed by Michael Zanetti
parent 28f6263ec0
commit feed7ac396
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/control vendored
View File

@ -58,7 +58,9 @@ Depends: libqt5network5,
libguh1 (= ${binary:Version}), libguh1 (= ${binary:Version}),
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Recommends: guh-webinterface, guh-cli Recommends: guh-webinterface,
guh-cli,
network-manager
Description: An open source IoT server - daemon Description: An open source IoT server - daemon
The guh daemon is a plugin based IoT (Internet of Things) server. The The guh daemon is a plugin based IoT (Internet of Things) server. The
server works like a translator for devices, things and services and server works like a translator for devices, things and services and
@ -120,7 +122,7 @@ Architecture: any
Depends: guh (= ${binary:Version}), Depends: guh (= ${binary:Version}),
${shlibs:Depends}, ${shlibs:Depends},
${misc: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 The guh daemon is a plugin based IoT (Internet of Things) server. The
server works like a translator for devices, things and services and server works like a translator for devices, things and services and
allows them to interact. allows them to interact.

2
server/networkmanager/networkdevice.cpp
View File

@ -57,7 +57,7 @@ NetworkDevice::NetworkDevice(const QDBusObjectPath &objectPath, QObject *parent)
m_autoconnect = m_networkDeviceInterface->property("Autoconnect").toBool(); m_autoconnect = m_networkDeviceInterface->property("Autoconnect").toBool();
m_deviceState = NetworkDeviceState(m_networkDeviceInterface->property("State").toUInt()); 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<QDBusObjectPath>(m_networkDeviceInterface->property("ActiveConnection")); m_activeConnection = qdbus_cast<QDBusObjectPath>(m_networkDeviceInterface->property("ActiveConnection"));
m_ip4Config = qdbus_cast<QDBusObjectPath>(m_networkDeviceInterface->property("Ip4Config")); m_ip4Config = qdbus_cast<QDBusObjectPath>(m_networkDeviceInterface->property("Ip4Config"));

2
server/networkmanager/networkmanager.cpp
View File

@ -317,7 +317,7 @@ void NetworkManager::onDeviceAdded(const QDBusObjectPath &deviceObjectPath)
} }
// Create object // Create object
NetworkDevice::NetworkDeviceType deviceType = NetworkDevice::NetworkDeviceType(networkDeviceInterface.property("NetworkDeviceType").toUInt()); NetworkDevice::NetworkDeviceType deviceType = NetworkDevice::NetworkDeviceType(networkDeviceInterface.property("DeviceType").toUInt());
switch (deviceType) { switch (deviceType) {
case NetworkDevice::NetworkDeviceTypeWifi: { case NetworkDevice::NetworkDeviceTypeWifi: {
WirelessNetworkDevice *wirelessNetworkDevice = new WirelessNetworkDevice(deviceObjectPath, this); WirelessNetworkDevice *wirelessNetworkDevice = new WirelessNetworkDevice(deviceObjectPath, this);