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

don't create a dbus connection before the QCoreApplication

Browse Source
This commit is contained in:
Michael Zanetti 2018-03-26 14:00:47 +02:00
parent 4e7238578c
commit 99bec9583b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libnymea/nymeadbusservice.cpp
View File

@ -22,11 +22,13 @@
#include "nymeadbusservice.h" #include "nymeadbusservice.h"
#include "loggingcategories.h" #include "loggingcategories.h"
QDBusConnection NymeaDBusService::s_connection = QDBusConnection::systemBus(); QDBusConnection::BusType NymeaDBusService::s_busType = QDBusConnection::SystemBus;
NymeaDBusService::NymeaDBusService(const QString &objectPath, QObject *parent) : QObject(parent) NymeaDBusService::NymeaDBusService(const QString &objectPath, QObject *parent):
QObject(parent),
m_connection(s_busType == QDBusConnection::SystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus())
{ {
bool status = s_connection.registerService("io.guh.nymead"); bool status = m_connection.registerService("io.guh.nymead");
if (!status) { if (!status) {
qCWarning(dcApplication()) << "Failed to register D-Bus service."; qCWarning(dcApplication()) << "Failed to register D-Bus service.";
return; return;
@ -36,7 +38,7 @@ NymeaDBusService::NymeaDBusService(const QString &objectPath, QObject *parent) :
finalObjectPath.append(part.at(0).toUpper()); finalObjectPath.append(part.at(0).toUpper());
finalObjectPath.append(part.right(part.length() - 1)); finalObjectPath.append(part.right(part.length() - 1));
} }
status = s_connection.registerObject(finalObjectPath, "io.guh.nymead", parent, QDBusConnection::ExportScriptableSlots); status = m_connection.registerObject(finalObjectPath, "io.guh.nymead", parent, QDBusConnection::ExportScriptableSlots);
if (!status) { if (!status) {
qCWarning(dcApplication()) << "Failed to register D-Bus object:" << finalObjectPath; qCWarning(dcApplication()) << "Failed to register D-Bus object:" << finalObjectPath;
return; return;
@ -51,15 +53,14 @@ bool NymeaDBusService::isValid()
QDBusConnection NymeaDBusService::connection() const QDBusConnection NymeaDBusService::connection() const
{ {
return s_connection; return m_connection;
} }
/*! This will configure all NymeaDBusService objects to be registered on the given \a busType.
* Note that this will only affect instances created after this method has been called.
*/
void NymeaDBusService::setBusType(QDBusConnection::BusType busType) void NymeaDBusService::setBusType(QDBusConnection::BusType busType)
{ {
if (busType == QDBusConnection::SessionBus) { s_busType = busType;
s_connection = QDBusConnection::sessionBus();
} else {
s_connection = QDBusConnection::systemBus();
}
} }

3
libnymea/nymeadbusservice.h
View File

@ -42,7 +42,8 @@ protected:
QDBusConnection connection() const; QDBusConnection connection() const;
private: private:
static QDBusConnection s_connection; static QDBusConnection::BusType s_busType;
QDBusConnection m_connection;
bool m_isValid = false; bool m_isValid = false;
}; };