diff --git a/build-package.sh b/build-package.sh
new file mode 100755
index 0000000000000000000000000000000000000000..432c2cf81721fde01e475c51df0523dce84f0245
--- /dev/null
+++ b/build-package.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# @author: Yun Liu <yun.liu@savoirfairelinux.com>
+#
+# Build sflphone debian packages for Ubuntu 8.04
+#1. Before building sflphone package, you need get gpg key. Skip it if you have already one.
+# Usage: gpg --gen-key
+#2. You mush have access to sflphone git repository. Skip this step if you have the access.
+# Refer to http://dev.savoirfairelinux.net/sflphone/wiki/DownloadSFLphone#Developmentsources
+#3. After having all the prerequisites, you can run "build-package.sh" to build debian packages for sflphone.
+# All the source packages and binary packages will be generated in the current directory.
+
+if [ -d "sflphone" ]; then
+ echo "Directory sflphone already exists. Please remove it first."
+ exit 1
+fi
+
+git clone git+ssh://repos-sflphone-git@sflphone.org/~/sflphone.git
+
+# Get system parameters
+arch_flag=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
+os_version=`lsb_release -d -s -c | sed -e '1d'`
+
+# If intrepid(Ubuntu8.10), then use appropriate changelog file
+if [ $os_version == "intrepid" ];then
+ cp sflphone/debian/changelog.intrepid sflphone/debian/changelog
+else
+ cp sflphone/debian/changelog.hardy sflphone/debian/changelog
+fi
+
+# Remove useless git directory
+rm sflphone/.git/ -rf
+
+# Copy the appropriate control file based on different archtecture
+if [ $arch_flag -eq 32 ] && [ $os_version == "intrepid" ];then
+ cp sflphone/debian/control.intrepid.i386 sflphone/debian/control
+elif [ $arch_flag -eq 64 ] && [ $os_version == "intrepid" ];then
+ cp sflphone/debian/control.intrepid.amd64 sflphone/debian/control
+elif [ $arch_flag -eq 32 ] && [ $os_version == "hardy" ];then
+ cp sflphone/debian/control.hardy.i386 sflphone/debian/control
+else
+ cp sflphone/debian/control.hardy.amd64 sflphone/debian/control
+fi
+
+echo "Building sflphone package on Ubuntu $os_version $arch_flag bit archetecture...."
+
+# Provide prerequisite directories used by debuild
+cp sflphone sflphone-0.9.2 -r
+cp sflphone sflphone-0.9.2.orig -r
+
+# Build packages
+cd sflphone-0.9.2/debian; debuild
+
+# Clean
+rm sflphone-0.9.2/ -rf
+rm sflphone/ -rf
+
+echo "Building package finished successullly!"
diff --git a/debian/changelog b/debian/changelog.hardy
similarity index 95%
rename from debian/changelog
rename to debian/changelog.hardy
index a984ee1eae9930da99c0b16d16c410c783117d7f..565d7a5f6999e6d86634dcf845c749803ba99b00 100644
--- a/debian/changelog
+++ b/debian/changelog.hardy
@@ -1,3 +1,9 @@
+sflphone (0.9.2-0ubuntu2) hardy; urgency=low
+
+ * Fix bug ticket #129
+
+ -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
+
sflphone (0.9.2-0ubuntu1) hardy; urgency=low
* Migrate from eXosip library to pjsip
diff --git a/debian/changelog.intrepid b/debian/changelog.intrepid
new file mode 100644
index 0000000000000000000000000000000000000000..de3ed2652b2b7ce7a1557e32b9083f9cddbaeb8f
--- /dev/null
+++ b/debian/changelog.intrepid
@@ -0,0 +1,85 @@
+sflphone (0.9.2-2ubuntu2) intrepid; urgency=low
+
+ * Fix bug ticket #129
+
+ -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
+
+sflphone (0.9.2-2ubuntu1) intrepid; urgency=low
+
+ * Migrate from eXosip library to pjsip
+ * Add multiple SIP accounts support
+ * Fix ringtones problems
+ * Add a pulseaudio support
+ * Improve audio quality with ALSA
+ * Add chinese translation
+ * Improve spanish translation
+ * Migrate to a maintained C++ DBus bindings
+ * Clean and improve the build system
+ * Add build-dependency on Perl because we need pod2man to generate manpages
+
+ -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 26 Nov 2008 09:47:53 -0500
+
+sflphone (0.9.1) unstable; urgency=low
+ * Add a search tool in the history
+ * Migrate some gtk_entry_new to sexy_icon_entry_new
+ * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
+ the history tab
+ * Add the SIP registration expire value in the user file.
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 22 May 2008 11:14:25 -0500
+
+sflphone (0.9.0) unstable; urgency=low
+ * Add history features
+ * Call date
+ * Call duration
+ * Mouse events in the history tab
+ * Smooth switch from the history tab to the calls tab
+ * Remove most of GTK-Critical warnings
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 13 May 2008 16:58:25 -0500
+
+sflphone (0.9-2008-06-06) unstable; urgency=low
+ * Audio bug correction: capture stopped after a few minutes of conversation
+ with USB Plantronics sound card
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Tue, 06 May 2008 16:58:25 -0500
+
+sflphone (0.9-2008-05-06) unstable; urgency=low
+ * Bug correction: account creation with the assistant
+ * GTK+ warnings removal
+ * libnotify warnings removal
+ * Remove aliasing on the SFLphone logo
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Mon, 05 May 2008 16:58:25 -0500
+
+sflphone (0.9) unstable; urgency=low
+ * Clean dependencies ( removal of libboost )
+ * Several GTK improvement and updates
+ -account window
+ -configuration window
+ * Migrate from GtkCheckMenuItem to GtkImageMenuItem
+ * ALSA standard I/O transfers: MMAP instead of R/W
+ * Fix speex audio quality
+ * IAX2 protocol
+ -Fix hold/unhold situation
+ -Add on hold music
+ * SIP protocol
+ -Ringtone on incoming call
+ -Fix transfer situation
+ * Add desktop notification ( libnotify )
+ * Improve the system tray icon behaviour
+ * Improve registration error handling
+ * Register/unregister from the account window takes effect without starting back SFLphone
+ * Compilation warnings removal
+ * Call history
+ * Add an account configuration wizard
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
+
+sflphone (0.8.2) unstable; urgency=low
+ * Internationalization of the GTK GUI
+ * English / French
+ * STUN support
+ * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/debian/control.amd64 b/debian/control.hardy.amd64
similarity index 100%
rename from debian/control.amd64
rename to debian/control.hardy.amd64
diff --git a/debian/control.i386 b/debian/control.hardy.i386
similarity index 100%
rename from debian/control.i386
rename to debian/control.hardy.i386
diff --git a/debian/control.intrepid.amd64 b/debian/control.intrepid.amd64
new file mode 100644
index 0000000000000000000000000000000000000000..eafb6792fa47b638c2906320d191d77528161560
--- /dev/null
+++ b/debian/control.intrepid.amd64
@@ -0,0 +1,17 @@
+Source: sflphone
+Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.8.0
+
+Package: sflphone
+Priority: optional
+Architecture: amd64
+Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8)
+Homepage: http://www.sflphone.org
+Description: SIP and IAX2 compatible softphone
+ SFLphone is meant to be a robust enterprise-class desktop phone.
+ SFLphone is released under the GNU General Public License.
+ SFLphone is being developed by the global community, and maintained by
+ Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/debian/control.intrepid.i386 b/debian/control.intrepid.i386
new file mode 100644
index 0000000000000000000000000000000000000000..5095bba2da064af511824b5e0b18a00b3d23bbb7
--- /dev/null
+++ b/debian/control.intrepid.i386
@@ -0,0 +1,17 @@
+Source: sflphone
+Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.8.0
+
+Package: sflphone
+Priority: optional
+Architecture: i386
+Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8)
+Homepage: http://www.sflphone.org
+Description: SIP and IAX2 compatible softphone
+ SFLphone is meant to be a robust enterprise-class desktop phone.
+ SFLphone is released under the GNU General Public License.
+ SFLphone is being developed by the global community, and maintained by
+ Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/debian/rules b/debian/rules
index a3db23565f9b3eb2764753c31c58c07a681c9e85..0c28f46b62d90841a60769068831f7647eb560bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,8 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ./autogen.sh
- ./configure --prefix=/usr --with-debug
- cd sflphone-gtk; ./autogen.sh; ./configure --prefix=/usr
+ ./autogen.sh --prefix=/usr --with-debug
+ cd sflphone-gtk; ./autogen.sh --prefix=/usr
cd libs/pjproject-1.0; ./configure
touch configure-stamp
@@ -35,7 +34,7 @@ build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
$(MAKE)
- cd sflphone-gtk; $(MAKE)
+ cd sflphone-gtk; make
cd libs/pjproject-1.0; $(MAKE) dep; $(MAKE)
touch $@
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 51d8342d80b9420de3435c53a01b7e1e46501606..ab0f97ff7d588c5ed014647983ea0de8aa8db0cb 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -274,6 +274,11 @@ ManagerImpl::answerCall(const CallID& id)
return false;
}
+ if (hasCurrentCall()) {
+ _debug("* Manager Info: there is currently a call, try to hold it\n");
+ onHoldCall(getCurrentCallId());
+ }
+
if (!getAccountLink(accountid)->answer(id)) {
// error when receiving...
removeCallAccount(id);