Skip to content
Snippets Groups Projects
Commit 12dcc704 authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

Save

parent cee79fca
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ Makefile ...@@ -11,6 +11,7 @@ Makefile
Makefile.in Makefile.in
*.spec *.spec
*moc*.* *moc*.*
/config.*
# Ignore rendered docs # Ignore rendered docs
doc/html doc/html
......
<?xml version="1.0" ?> <?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"> <method name="getAccountDetails">
<arg type="s" name="accountID" direction="in"/> <arg type="s" name="accountID" direction="in"/>
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <dbusmanagerimpl.h> #include <dbusmanagerimpl.h>
const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLPhone";
void void
DBusManagerImpl::connect(){ DBusManagerImpl::connect(){
...@@ -27,6 +29,17 @@ DBusManagerImpl::connect(){ ...@@ -27,6 +29,17 @@ DBusManagerImpl::connect(){
int int
DBusManagerImpl::exec(){ DBusManagerImpl::exec(){
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; return 1;
} }
......
...@@ -26,9 +26,11 @@ class DBusManagerImpl { ...@@ -26,9 +26,11 @@ class DBusManagerImpl {
public: public:
void connect(); void connect();
int exec(); int exec();
static const char* SERVER_NAME;
private: private:
CallManager * _callManager; CallManager * _callManager;
DBus::BusDispatcher _dispatcher;
}; };
#endif #endif
...@@ -77,7 +77,7 @@ main (int argc, char **argv) { ...@@ -77,7 +77,7 @@ main (int argc, char **argv) {
//GUI = &(GUIServer::instance()); //GUI = &(GUIServer::instance());
//GUIServer::instance().setSessionPort(sessionPort); //GUIServer::instance().setSessionPort(sessionPort);
//Manager::instance().setGui(GUI); //Manager::instance().setGui(GUI);
exit_code = DBusManager::instance().toto(); exit_code = DBusManager::instance().exec();
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment