Merge branch 'jb38834' into 'master'

Register DBus object/service in correct order See merge request !3
sailfishos · Jun 1, 2017 · 8f6ee46 · 8f6ee46
2 parents f75337a + 7fc73c3
commit 8f6ee46
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -47,18 +47,16 @@ QConnectionAgent::QConnectionAgent(QObject *parent) :
     delayedTethering(false),
     valid(true)
 {
-    qDebug() << Q_FUNC_INFO;
-
     new ConnAdaptor(this);
     QDBusConnection dbus = QDBusConnection::sessionBus();
 
-    if (!dbus.registerService(CONND_SERVICE)) {
-        qDebug() << "XXXXXXXXXXX could not register service XXXXXXXXXXXXXXXXXX";
+    if (!dbus.registerObject(CONND_PATH, this)) {
+        qDebug() << "QConnectionAgent: Could not register object to path" << CONND_PATH;
         valid = false;
     }
 
-    if (!dbus.registerObject(CONND_PATH, this)) {
-        qDebug() << "XXXXXXXXXXX could not register object XXXXXXXXXXXXXXXXXX";
+    if (!dbus.registerService(CONND_SERVICE)) {
+        qDebug() << "QConnectionAgent: could not register service" << CONND_SERVICE;
         valid = false;
     }