diff --git a/src/dbus/callmanager.h b/src/dbus/callmanager.h index cfeaf18f0f225e9a51b4f648eb5a1f7eac80824e..80d8124569a42bee41e74fc4a2f21d1c0a444bd5 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 32c686a3c2e10e1ce4bff88947700ebdcec74431..f6361f7c9d93df1cbabf83661e494c2f90f1f9db 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 078feb70476a322d107adf9a7eeb12bd2a8a14fc..a1689e267615a950a42114baf35028b01a97b7e9 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 3446a131dee049ddf61e6597e120b65270d938c2..5648982dbfd5140ea622b5d7ca07f93dbeb773f2 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); + } } /**