diff --git a/README b/README index 9c4aa4c5fdb462a2eabaebfab68ef0d0b3fb0f72..69819e003dfdd811027a0be8151804f6e9be7301 100644 --- a/README +++ b/README @@ -33,6 +33,15 @@ Dependencies build instructions: ./configure [option] make make install + +6/ If you want the new gui +use: ./configure --enable-newgui +and do +cd src/gui/official +QTDIR=/usr/lib/qt4 qmake4 sflphone.pro +ln -s ../../../utilspp +QTDIR=/usr/lib/qt4 make + How to compile SFLphone ? diff --git a/configure.ac b/configure.ac index bb351e1c3f74390eec12d92dea189d5ad19f30bd..ee3e3463bbe1730cb486082725b07c3c7554a331 100644 --- a/configure.ac +++ b/configure.ac @@ -196,7 +196,6 @@ src/audio/pacpp/source/portaudiocpp/Makefile \ src/config/Makefile \ src/gui/Makefile \ src/gui/qt/Makefile \ -src/gui/official/Makefile \ src/gui/server/Makefile \ src/zeroconf/Makefile \ utilspp/Makefile \ diff --git a/src/gui/official/PhoneLineManagerImpl.cpp b/src/gui/official/PhoneLineManagerImpl.cpp index ff62fd8a3432f3cc9ffd41dd55a909f8a070547a..3cfe7968638694a1d7d952251e5e3bd34d891233 100644 --- a/src/gui/official/PhoneLineManagerImpl.cpp +++ b/src/gui/official/PhoneLineManagerImpl.cpp @@ -17,6 +17,7 @@ PhoneLineManagerImpl::PhoneLineManagerImpl() , mCurrentLine(NULL) , mIsInitialized(false) { + EventFactory::instance().registerEvent< CallRelatedEvent >("000"); EventFactory::instance().registerEvent< IncommingEvent >("001"); EventFactory::instance().registerEvent< HangupEvent >("002"); EventFactory::instance().registerEvent< TryingStatus >("110"); diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index cc7dbf2aff4bad986becc47bc3fa364c9e7f7fad..f011d823affb23549168f30a574991df70838c03 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -115,9 +115,9 @@ ManagerImpl::~ManagerImpl (void) unloadAudioCodec(); - delete _error; - delete _tone; delete _audiodriverPA; + delete _tone; + delete _error; #ifdef USE_ZEROCONF delete _DNSService;