X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fvicar-daemon%2Fcpp%2Fcallrouter.cpp;fp=src%2Fvicar-daemon%2Fcpp%2Fcallrouter.cpp;h=0ea72cbd6ea780d9af796e35e0d5ecdfe9053e85;hp=0b95d92401e250cf5f732828dedd546af137c6b9;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hpb=2b82f07726d657dff4ad091f056b8685d5ba9930

diff --git a/src/vicar-daemon/cpp/callrouter.cpp b/src/vicar-daemon/cpp/callrouter.cpp
index 0b95d92..0ea72cb 100755
--- 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);
-        this->registerDBusService();
-        qDebug() << "Vicar-Daemon: Registered DBus Service " << APPLICATION_DBUS_SERVICE;
+        this->registerDBusService();        
 }
 
 CallRouter::~CallRouter(){
@@ -68,16 +67,23 @@ void CallRouter::registerDBusService(){
     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);
         }
+        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();
+        qDebug() << "Vicar-Daemon: Exiting";
         exit(2);
     }
-
+    else{
+        qDebug() << "Vicar-Daemon: Registered DBus Object " << APPLICATION_DBUS_PATH;
+    }
 }