Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / src / vicar-daemon / cpp / callrouter.cpp

diff --git a/src/vicar-daemon/cpp/callrouter.cpp b/src/vicar-daemon/cpp/callrouter.cpp
index 0b95d92..0ea72cb 100755 (executable)
--- a/src/vicar-daemon/cpp/callrouter.cpp
+++ b/src/vicar-daemon/cpp/callrouter.cpp
@@ -54,8 +54,7 @@ CallRouter::CallRouter(QObject *parent) :
     d(new CallRouterPrivate(this))
 {
         Q_ASSERT(0 != d);
     d(new CallRouterPrivate(this))
 {
         Q_ASSERT(0 != d);

-        this->registerDBusService();
-        qDebug() << "Vicar-Daemon: Registered DBus Service " << APPLICATION_DBUS_SERVICE;
+        this->registerDBusService();        

 }
 
 CallRouter::~CallRouter(){
 }
 
 CallRouter::~CallRouter(){

@@ -68,16 +67,23 @@ void CallRouter::registerDBusService(){
     if (!connection.interface()->isServiceRegistered(APPLICATION_DBUS_SERVICE)){
 
         if (!connection.registerService(APPLICATION_DBUS_SERVICE)) {
     if (!connection.interface()->isServiceRegistered(APPLICATION_DBUS_SERVICE)){
 
         if (!connection.registerService(APPLICATION_DBUS_SERVICE)) {

-            qDebug() << "Vicar-Daemon: " << d->dbusUtility->getErrorMessage();
+            qDebug() << "Vicar-Daemon: Error registering D-Bus service " << d->dbusUtility->getErrorMessage();
+            qDebug() << "Vicar-Daemon: Exiting";

             exit(1);
         }
             exit(1);
         }

+        else{
+            qDebug() << "Vicar-Daemon: Registered DBus Service " << APPLICATION_DBUS_SERVICE;
+        }

     }
 
     if (!connection.registerObject(APPLICATION_DBUS_PATH, this, QDBusConnection::ExportAdaptors)) {
         qDebug() << "Vicar-Daemon: " << d->dbusUtility->getErrorMessage();
     }
 
     if (!connection.registerObject(APPLICATION_DBUS_PATH, this, QDBusConnection::ExportAdaptors)) {
         qDebug() << "Vicar-Daemon: " << d->dbusUtility->getErrorMessage();

+        qDebug() << "Vicar-Daemon: Exiting";

         exit(2);
     }
         exit(2);
     }

-
+    else{
+        qDebug() << "Vicar-Daemon: Registered DBus Object " << APPLICATION_DBUS_PATH;
+    }

 }
 
 
 }