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

Register DBus type properly

Browse Source
This commit is contained in:
Simon Stürz 2018-11-22 11:02:08 +01:00
parent fe9a4c6048
commit 309f0b6c93
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-networkmanager/networkconnection.cpp
View File

@ -30,6 +30,7 @@ NetworkConnection::NetworkConnection(const QDBusObjectPath &objectPath, QObject
QObject(parent), QObject(parent),
m_objectPath(objectPath) m_objectPath(objectPath)
{ {
qRegisterMetaType<ConnectionSettings>("ConnectionSettings");
qDBusRegisterMetaType<ConnectionSettings>(); qDBusRegisterMetaType<ConnectionSettings>();
m_connectionInterface = new QDBusInterface(NetworkManagerUtils::networkManagerServiceString(), m_objectPath.path(), NetworkManagerUtils::connectionsInterfaceString(), QDBusConnection::systemBus(), this); m_connectionInterface = new QDBusInterface(NetworkManagerUtils::networkManagerServiceString(), m_objectPath.path(), NetworkManagerUtils::connectionsInterfaceString(), QDBusConnection::systemBus(), this);

1
libnymea-networkmanager/networkconnection.h
View File

@ -60,6 +60,7 @@ private:
ConnectionSettings m_connectionSettings; ConnectionSettings m_connectionSettings;
}; };
Q_DECLARE_METATYPE(ConnectionSettings)
QDebug operator<<(QDebug debug, NetworkConnection *networkConnection); QDebug operator<<(QDebug debug, NetworkConnection *networkConnection);
#endif // NETWORKCONNECTION_H #endif // NETWORKCONNECTION_H

6
nymea-networkmanager/core.cpp
View File

@ -174,6 +174,12 @@ void Core::evaluateNetworkManagerState(const NetworkManager::NetworkManagerState
if (m_mode != ModeOffline) if (m_mode != ModeOffline)
return; return;
// Note: if the wireless device is in the access point mode, the bluetooth server should stop
if (m_wirelessDevice->mode() == WirelessNetworkDevice::ModeAccessPoint) {
stopService();
return;
}
switch (state) { switch (state) {
case NetworkManager::NetworkManagerStateConnectedGlobal: case NetworkManager::NetworkManagerStateConnectedGlobal:
// We are online // We are online