From 12dcc704d4cef0e69de9082bee333bb41202b54a Mon Sep 17 00:00:00 2001
From: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
Date: Tue, 28 Aug 2007 14:27:22 -0400
Subject: [PATCH] Save
---
.gitignore | 1 +
src/dbus/configurationmanager-introspec.xml | 4 ++--
src/dbus/dbusmanagerimpl.cpp | 15 ++++++++++++++-
src/dbus/dbusmanagerimpl.h | 2 ++
src/main.cpp | 2 +-
5 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 385588f53f..6fb5711038 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 fda1b05fbd..80cca46ce2 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 935c1b8462..fce813f4cb 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 0b9de0ef54..9b0c5d38fc 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 cd6fa35caa..5d5b6223f5 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();
}
}
--
GitLab