Commit 95b167b6 authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

IncomingCalls works

parent 373583cf
......@@ -21,6 +21,7 @@
#define CALLMANAGER_H
#include "callmanager-glue.h"
#include "../gui/guiframework.h"
#include <dbus-c++/dbus.h>
......
......@@ -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;
......
......@@ -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
}
}
......
......@@ -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);
}
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment