diff --git a/configure.ac b/configure.ac
index fae72a0707c0e75f534310554c75aa8814171e09..70358be5a8879f49836c771f2c331a92d1f35b6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([SFLphone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.9.4],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$])
diff --git a/debian/changelog b/debian/changelog
index a9a2d466e2f55973d8e2469f393913399fc2a141..82738fe39e45b91e3ac4d680a3d0c2706644fda3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sflphone (0.9.4-0beta1) %system%; urgency=low
+
+ [ Alexandre Savard ]
+ * Display codec used during conversation on the GUI
+ * Enable/disable STUN parameters at runtime
+ * Refactor search bar use
+ [ Emmanuel Milou ]
+ * Build system fixes
+ * Implement SIP re-invite
+ * Implement IP to IP call
+ [ Julien Bonjean ]
+ * Integrate GNOME address book based on evolution data server
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
+
+
sflphone (0.9.3-0ubuntu3) %system%; urgency=low
[ Alexandre Savard ]
diff --git a/debian/rules b/debian/rules
index fd00d4698a8c5990de34d79b2a027973d7334c2f..c67463555b7fb6a22722ba263014dc2e120a600a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ cd libs/dbus-c++; ./autogen.sh; ./configure
+ cd libs/libiax2; ./gen.sh; ./configure
+ cd libs/pjproject-1.0.1; ./configure
./autogen.sh --prefix=/usr --with-debug
cd sflphone-gtk; ./autogen.sh --prefix=/usr
- cd libs/pjproject-1.0.1; ./configure
touch configure-stamp
- cd libs/dbus-c++; ./configure
- cd libs/libiax2; ./configure
#Architecture
diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index 2864ef4cf513198a24413a24614d56ede7110563..e6e25412930a5348f41dd659386bd3fe14909bb8 100644
--- a/sflphone-gtk/configure.ac
+++ b/sflphone-gtk/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT([SFLphone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.9.4],[sflphoneteam@savoirfairelinux.com],[sflphone])
AM_CONFIG_HEADER(config.h)
LT_INIT
PACKAGE=SFLphone
-VERSION=0.9.3
+VERSION=0.9.4
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AC_CONFIG_MACRO_DIR([m4])
@@ -26,17 +26,17 @@ fi
AC_PROG_CC
AC_PROG_INSTALL
AC_STDC_HEADERS
+AC_PROG_LIBTOOL
PKG_CHECK_MODULES(DEPS, \
dbus-glib-1 >= 0.35 \
libnotify >= 0.4 \
gtk+-2.0 >= 2.2 \
glib-2.0 >= 2.2 \
- libsexy >= 0.1 \
+ libsexy >= 0.1 \
libebook-1.2 >= 2.22
)
-
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
diff --git a/sflphone-gtk/src/contactlist/Makefile.am b/sflphone-gtk/src/contactlist/Makefile.am
index d8fee4636b19b1bd2d28abe3d21b7753647c0412..d603d369c831b92052444431560433b399f92747 100644
--- a/sflphone-gtk/src/contactlist/Makefile.am
+++ b/sflphone-gtk/src/contactlist/Makefile.am
@@ -3,6 +3,6 @@ noinst_LTLIBRARIES = libcontact.la
libcontact_la_SOURCES = \
eds.c
-libcontact_la_LDFLAGS= -pthread -lebook-1.2 -lgnome-2 -lpopt -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lz -lfontconfig -lgmodule-2.0 -lgobject-2.0 -lglib-2.0
-
-libcontact_la_CFLAGS=-DORBIT2=1 -pthread -I/usr/include/evolution-data-server-2.24 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libxml2 -I/usr/include/libsoup-2.4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pygtk-2.0
+libcontact_la_LDFLAGS=@DEPS_LDFLAGS@
+
+libcontact_la_CFLAGS=@DEPS_CFLAGS@
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 9804f11620a33a2e61648d4fbee8203529e2e551..07c9ce331af16b7c5b13ea741788e0ec92e4f400 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -375,9 +375,12 @@ ManagerImpl::onHoldCall(const CallID& id)
{
AccountID accountid;
bool returnValue;
+ CallID call_id;
stopTone(true);
+ call_id = id;
+
/* Direct IP to IP call */
if (getConfigFromCall (id) == Call::IPtoIP) {
returnValue = SIPVoIPLink::instance (AccountNULL)-> onhold (id);
@@ -396,7 +399,7 @@ ManagerImpl::onHoldCall(const CallID& id)
removeWaitingCall(id);
switchCall("");
- if (_dbus) _dbus->getCallManager()->callStateChanged(id, "HOLD");
+ if (_dbus) _dbus->getCallManager()->callStateChanged(call_id, "HOLD");
return returnValue;
}
@@ -409,12 +412,15 @@ ManagerImpl::offHoldCall(const CallID& id)
AccountID accountid;
bool returnValue, rec;
std::string codecName;
+ CallID call_id;
stopTone(false);
+ call_id = id;
//Place current call on hold if it isn't
if (hasCurrentCall())
{
+ _debug ("Put the current call (ID=%s) on hold\n", getCurrentCallId().c_str());
onHoldCall(getCurrentCallId());
}
@@ -438,9 +444,9 @@ ManagerImpl::offHoldCall(const CallID& id)
if (_dbus){
if (rec)
- _dbus->getCallManager()->callStateChanged(id, "UNHOLD_RECORD");
+ _dbus->getCallManager()->callStateChanged(call_id, "UNHOLD_RECORD");
else
- _dbus->getCallManager()->callStateChanged(id, "UNHOLD_CURRENT");
+ _dbus->getCallManager()->callStateChanged(call_id, "UNHOLD_CURRENT");
}
switchCall(id);
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 037686ab0fabd2fc87780dd9d2cfff8a80c10078..f4c5a838ba311e5d33d1d578111707b2d02425c3 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -717,6 +717,7 @@ SIPVoIPLink::offhold(const CallID& id)
bool
SIPVoIPLink::transfer(const CallID& id, const std::string& to)
{
+
SIPCall *call;
std::string tmp_to;
pjsip_evsub *sub;
@@ -727,7 +728,6 @@ SIPVoIPLink::transfer(const CallID& id, const std::string& to)
AccountID account_id;
Account* account;
-
call = getSIPCall(id);
call->stopRecording();
account_id = Manager::instance().getAccountFromCall(id);
@@ -739,8 +739,14 @@ SIPVoIPLink::transfer(const CallID& id, const std::string& to)
}
tmp_to = SIPToHeader(to);
- if (tmp_to.find("@") == std::string::npos) {
- tmp_to = tmp_to + "@" + account->getHostname();
+ if (account) {
+ if (tmp_to.find("@") == std::string::npos) {
+ tmp_to = tmp_to + "@" + account->getHostname();
+ }
+ }
+
+ else {
+
}
_debug("In transfer, tmp_to is %s\n", tmp_to.data());
@@ -762,7 +768,6 @@ SIPVoIPLink::transfer(const CallID& id, const std::string& to)
* because after this function, we can not find the cooresponding
* voiplink from the call any more. But the voiplink is useful!
*/
- AccountID accId = Manager::instance().getAccountFromCall(call->getCallId());
pjsip_evsub_set_mod_data(sub, getModId(), this);
/*
diff --git a/tools/build-package.sh b/tools/build-package.sh
index c2d4d5f85bab8e25b70fddf6a43dcd2cb23bf365..ec95e8e38a9d3fb53de97fa94b1d208c8b260b54 100755
--- a/tools/build-package.sh
+++ b/tools/build-package.sh
@@ -54,7 +54,7 @@ git checkout origin/release -b release
# 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'`
-ver=0.9.3
+ver=0.9.4
if [ $platform == "ubuntu" ];then
# Generate the changelog, according to the distribution and the git commit messages