From b6229dd6d94a4fb04e4080351c1efb0d0538dc67 Mon Sep 17 00:00:00 2001 From: Raine Makelainen Date: Thu, 1 Jun 2017 10:18:18 +0300 Subject: [PATCH] [connectionagent] Register DBus object/service in correct order. Fixes JB#38834 --- connd/qconnectionagent.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp index 26bd016..f11d111 100644 --- a/connd/qconnectionagent.cpp +++ b/connd/qconnectionagent.cpp @@ -52,13 +52,13 @@ QConnectionAgent::QConnectionAgent(QObject *parent) : 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() << "XXXXXXXXXXX could not register object XXXXXXXXXXXXXXXXXX"; valid = false; } - if (!dbus.registerObject(CONND_PATH, this)) { - qDebug() << "XXXXXXXXXXX could not register object XXXXXXXXXXXXXXXXXX"; + if (!dbus.registerService(CONND_SERVICE)) { + qDebug() << "XXXXXXXXXXX could not register service XXXXXXXXXXXXXXXXXX"; valid = false; }