diff --git a/.gitignore b/.gitignore index 385588f53fafe45d1b4f4d6fb711420d11c6e994..6fb5711038a99e7c76bd6f934b7a3a69e8c6d46b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ Makefile Makefile.in *.spec *moc*.* +/config.* # Ignore rendered docs doc/html diff --git a/src/dbus/configurationmanager-introspec.xml b/src/dbus/configurationmanager-introspec.xml index fda1b05fbd86555c990a07edec31ecbc4ff312a6..80cca46ce292ddbb8bace526ad1e06d21f98413f 100644 --- a/src/dbus/configurationmanager-introspec.xml +++ b/src/dbus/configurationmanager-introspec.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<node name="/org/sflphone/ConfigurationManager"> - <interface name="org.sflphone.ConfigurationManager"> +<node name="/org/sflphone/SFLPhone"> + <interface name="org.sflphone.SFLPhone.ConfigurationManager"> <method name="getAccountDetails"> <arg type="s" name="accountID" direction="in"/> diff --git a/src/dbus/dbusmanagerimpl.cpp b/src/dbus/dbusmanagerimpl.cpp index 935c1b84621ee40d1ae6fc7ecfe1e5dc08d17c2e..fce813f4cb50788fb745b1c62ca1c446fb882be2 100644 --- a/src/dbus/dbusmanagerimpl.cpp +++ b/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; } diff --git a/src/dbus/dbusmanagerimpl.h b/src/dbus/dbusmanagerimpl.h index 0b9de0ef541ab905f6ee6a880f96794198cde98c..9b0c5d38fc9817d81700f94001bbec9e8592a380 100644 --- a/src/dbus/dbusmanagerimpl.h +++ b/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 diff --git a/src/main.cpp b/src/main.cpp index cd6fa35caa87244841ed97f1bed77ce0ccbbda6a..5d5b6223f5050bbb95db9a10c50ca53ba54fb873 100644 --- a/src/main.cpp +++ b/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(); } }