From 506d1eaec8c26207e7af1d9c271316ab297447aa Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Tue, 4 Oct 2005 20:17:17 +0000
Subject: [PATCH] Add 000 support Remove official/Makefile from the configure
---
README | 9 +++++++++
configure.ac | 1 -
src/gui/official/PhoneLineManagerImpl.cpp | 1 +
src/managerimpl.cpp | 4 ++--
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 9c4aa4c5fd..69819e003d 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 bb351e1c3f..ee3e3463bb 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 ff62fd8a34..3cfe796863 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 cc7dbf2aff..f011d823af 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;
--
GitLab