Save

.gitignore

@@ -11,6 +11,7 @@ Makefile
 Makefile.in
 *.spec
 *moc*.*
+/config.*
 
 # Ignore rendered docs
 doc/html

src/dbus/configurationmanager-introspec.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<node name="/org/sflphone/ConfigurationManager">
+<node name="/org/sflphone/SFLPhone">
-  <interface name="org.sflphone.ConfigurationManager">
+  <interface name="org.sflphone.SFLPhone.ConfigurationManager">
   
     <method name="getAccountDetails">
       <arg type="s" name="accountID" direction="in"/>

src/dbus/dbusmanagerimpl.cpp

@@ -20,6 +20,8 @@
 #include <dbusmanagerimpl.h>
 
 
+const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLPhone";
+
 void 
 DBusManagerImpl::connect(){
 
@@ -27,7 +29,18 @@ DBusManagerImpl::connect(){
 
 int 
 DBusManagerImpl::exec(){
- return 1;
+
+
+	DBus::default_dispatcher = &_dispatcher;
+
+	DBus::Connection conn = DBus::Connection::SessionBus();
+	conn.request_name(SERVER_NAME);
+
+	_callManager = new CallManager(conn);
+    //_callManager = new CallManager(conn);
+	_dispatcher.enter();
+
+	return 1;
 }
         
     

src/dbus/dbusmanagerimpl.h

@@ -26,9 +26,11 @@ class DBusManagerImpl {
     public:
         void connect();
         int exec();
+        static const char* SERVER_NAME;
         
     private:
         CallManager * _callManager;
+        DBus::BusDispatcher _dispatcher;
 };
 
 #endif

src/main.cpp

@@ -77,7 +77,7 @@ main (int argc, char **argv) {
       //GUI = &(GUIServer::instance());
       //GUIServer::instance().setSessionPort(sessionPort);
       //Manager::instance().setGui(GUI);
-      exit_code = DBusManager::instance().toto();
+      exit_code = DBusManager::instance().exec();
       
     }
   }