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

Fix dbus type registration

Browse Source
This commit is contained in:
Simon Stürz 2018-11-22 11:38:54 +01:00
parent 309f0b6c93
commit ff35e2d152
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnymea-networkmanager/networkconnection.cpp
View File

@ -30,9 +30,6 @@ NetworkConnection::NetworkConnection(const QDBusObjectPath &objectPath, QObject
QObject(parent), QObject(parent),
m_objectPath(objectPath) m_objectPath(objectPath)
{ {
qRegisterMetaType<ConnectionSettings>("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);
if(!m_connectionInterface->isValid()) { if(!m_connectionInterface->isValid()) {
qCWarning(dcNetworkManager()) << "Invalid connection dbus interface"; qCWarning(dcNetworkManager()) << "Invalid connection dbus interface";
@ -65,6 +62,12 @@ void NetworkConnection::deleteConnection()
} }
void NetworkConnection::registerTypes()
{
qRegisterMetaType<ConnectionSettings>("ConnectionSettings");
qDBusRegisterMetaType<ConnectionSettings>();
}
/*! Returns the dbus object path of this \l{NetworkConnection}. */ /*! Returns the dbus object path of this \l{NetworkConnection}. */
QDBusObjectPath NetworkConnection::objectPath() const QDBusObjectPath NetworkConnection::objectPath() const
{ {

2
libnymea-networkmanager/networkconnection.h
View File

@ -42,6 +42,8 @@ public:
void deleteConnection(); void deleteConnection();
static void registerTypes();
QDBusObjectPath objectPath() const; QDBusObjectPath objectPath() const;
ConnectionSettings connectionSettings() const; ConnectionSettings connectionSettings() const;

3
libnymea-networkmanager/networkmanager.cpp
View File

@ -30,11 +30,12 @@
NetworkManager::NetworkManager(QObject *parent) : NetworkManager::NetworkManager(QObject *parent) :
QObject(parent) QObject(parent)
{ {
NetworkConnection::registerTypes();
// Get notification when network-manager appears/disappears on DBus // Get notification when network-manager appears/disappears on DBus
m_serviceWatcher = new QDBusServiceWatcher(NetworkManagerUtils::networkManagerServiceString(), QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration, this); m_serviceWatcher = new QDBusServiceWatcher(NetworkManagerUtils::networkManagerServiceString(), QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration, this);
connect(m_serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &NetworkManager::onServiceRegistered); connect(m_serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &NetworkManager::onServiceRegistered);
connect(m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &NetworkManager::onServiceUnregistered); connect(m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &NetworkManager::onServiceUnregistered);
} }
NetworkManager::~NetworkManager() NetworkManager::~NetworkManager()