Commit 8f6ee46a authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb38834' into 'master'

Register DBus object/service in correct order

See merge request !3
parents f75337af 7fc73c32
...@@ -47,18 +47,16 @@ QConnectionAgent::QConnectionAgent(QObject *parent) : ...@@ -47,18 +47,16 @@ QConnectionAgent::QConnectionAgent(QObject *parent) :
delayedTethering(false), delayedTethering(false),
valid(true) valid(true)
{ {
qDebug() << Q_FUNC_INFO;
new ConnAdaptor(this); new ConnAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus(); QDBusConnection dbus = QDBusConnection::sessionBus();
if (!dbus.registerService(CONND_SERVICE)) { if (!dbus.registerObject(CONND_PATH, this)) {
qDebug() << "XXXXXXXXXXX could not register service XXXXXXXXXXXXXXXXXX"; qDebug() << "QConnectionAgent: Could not register object to path" << CONND_PATH;
valid = false; valid = false;
} }
if (!dbus.registerObject(CONND_PATH, this)) { if (!dbus.registerService(CONND_SERVICE)) {
qDebug() << "XXXXXXXXXXX could not register object XXXXXXXXXXXXXXXXXX"; qDebug() << "QConnectionAgent: could not register service" << CONND_SERVICE;
valid = false; valid = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment