[voicecall] Correct order of D-Bus object/service registration. Contr…

…ibutes to JB#37012
sailfishos · Nov 24, 2016 · b4109e0 · b4109e0
1 parent 9a2fac0
commit b4109e0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/dbus/voicecallmanagerdbusservice.cpp b/src/dbus/voicecallmanagerdbusservice.cpp
@@ -77,16 +77,15 @@ bool VoiceCallManagerDBusService::configure(VoiceCallManagerInterface *manager)
     d->manager = manager;
     d->managerAdapter = new VoiceCallManagerDBusAdapter(manager);
 
-    if(!QDBusConnection::sessionBus().registerService("org.nemomobile.voicecall"))
+    if(!QDBusConnection::sessionBus().registerObject("/", manager))
     {
-
-        WARNING_T(QString("Failed to register DBus service: ") + QDBusConnection::sessionBus().lastError().message());
+        WARNING_T(QString("Failed to register DBus object: ") + QDBusConnection::sessionBus().lastError().message());
         return false;
     }
 
-    if(!QDBusConnection::sessionBus().registerObject("/", manager))
+    if(!QDBusConnection::sessionBus().registerService("org.nemomobile.voicecall"))
     {
-        WARNING_T(QString("Failed to register DBus object: ") + QDBusConnection::sessionBus().lastError().message());
+        WARNING_T(QString("Failed to register DBus service: ") + QDBusConnection::sessionBus().lastError().message());
         return false;
     }