From 95b167b638153c66d1dd2e91cf2020a7f47c0487 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
Date: Tue, 28 Aug 2007 18:42:09 -0400
Subject: [PATCH] IncomingCalls works
---
src/dbus/callmanager.h | 1 +
src/dbus/dbusmanagerimpl.cpp | 6 ++++--
src/main.cpp | 7 +------
src/managerimpl.cpp | 12 ++++++------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/dbus/callmanager.h b/src/dbus/callmanager.h
index cfeaf18f0f..80d8124569 100644
--- a/src/dbus/callmanager.h
+++ b/src/dbus/callmanager.h
@@ -21,6 +21,7 @@
#define CALLMANAGER_H
#include "callmanager-glue.h"
+#include "../gui/guiframework.h"
#include <dbus-c++/dbus.h>
diff --git a/src/dbus/dbusmanagerimpl.cpp b/src/dbus/dbusmanagerimpl.cpp
index 32c686a3c2..f6361f7c9d 100644
--- a/src/dbus/dbusmanagerimpl.cpp
+++ b/src/dbus/dbusmanagerimpl.cpp
@@ -18,14 +18,13 @@
*/
#include <dbusmanagerimpl.h>
-
+#include "manager.h"
const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLPhone";
int
DBusManagerImpl::exec(){
-
DBus::default_dispatcher = &_dispatcher;
DBus::Connection conn = DBus::Connection::SessionBus();
@@ -33,6 +32,9 @@ DBusManagerImpl::exec(){
_callManager = new CallManager(conn);
//_callManager = new CallManager(conn);
+
+ Manager::instance().getEvents(); // Register accounts
+
_dispatcher.enter();
return 1;
diff --git a/src/main.cpp b/src/main.cpp
index 078feb7047..a1689e2676 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,7 +58,6 @@ main (int argc, char **argv) {
sessionPort = atoi(ptrPort+7);
}
}
- GuiFramework *GUI;
bool initOK = false;
try {
Manager::instance().initConfigFile();
@@ -74,12 +73,8 @@ main (int argc, char **argv) {
exit_code = -1;
}
if (initOK) {
- //GUI = &(GUIServer::instance());
- //GUIServer::instance().setSessionPort(sessionPort);
- //Manager::instance().setGui(GUI);
Manager::instance().setDBusManager(&DBusManager::instance());
- exit_code = DBusManager::instance().exec();
-
+ exit_code = DBusManager::instance().exec(); // UI Loop
}
}
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 3446a131de..5648982dbf 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -745,21 +745,21 @@ void
ManagerImpl::registrationSucceed(const AccountID& accountid)
{
Account* acc = getAccount(accountid);
- /*if ( acc ) {
+ if ( acc ) {
acc->setState(true);
- if (_gui) _gui->sendRegistrationState(accountid, true);
- }*/
+ //if (_gui) _gui->sendRegistrationState(accountid, true);
+ }
}
//THREAD=VoIP
void
ManagerImpl::registrationFailed(const AccountID& accountid)
{
- /*Account* acc = getAccount(accountid);
+ Account* acc = getAccount(accountid);
if ( acc ) {
acc->setState(false);
- if (_gui) _gui->sendRegistrationState(accountid, false);
- }*/
+ //if (_gui) _gui->sendRegistrationState(accountid, false);
+ }
}
/**
--
GitLab