Merge branch 'master' into release

CODING

 Please follow our coding standards when developing
 http://projects.savoirfairelinux.net/wiki/sflphone/Coding_Standards
-
-

daemon/Makefile.am

@@ -26,9 +26,4 @@ EXTRA_DIST = README.gentoo \
 			 m4/lt~obsolete.m4 \
 			 m4/ltoptions.m4 \
 			 m4/ltsugar.m4 \
-			 m4/ltversion.m4 \
-			 images/logo_ico.png \
-			 images/sfl-logo.png \
-			 images/sflphone_logo.png \
-			 images/sflphone.png \
-			 images/tray-icon.png
+			 m4/ltversion.m4

daemon/NEWS

+SFLphoned (1.0.2) / 2012-07-02
+	* Stable version
+	* Update Contact header from 200 OK
+	* Keep alive for account regstration
+	* Call history now managed by client
+
 SFLphoned (0.9.12) / 2011-11-12
 	* Refactoring of the RTP session allowing dynamic update of audio codecs
 	* Updated synchronization between transport layer and audio layer

daemon/autogen.sh

 #!/bin/sh -e
 
 # Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
-[ ! -e m4 ] && mkdir m4
+mkdir -p m4
+
+HOOKS_DIR="../.git/hooks"
+# install pre-commit hook for doing clean commits
+if [ -d "$HOOKS_DIR" ];
+then
+    if test ! \( -x ${HOOKS_DIR}/pre-commit -a -L ${HOOKS_DIR}/pre-commit \);
+    then
+        rm -f ${HOOKS_DIR}/pre-commit
+        ln -s ${HOOKS_DIR}/pre-commit.sample ${HOOKS_DIR}/pre-commit
+    fi
+fi
 
 autoreconf --force --install --verbose -Wall -I m4

daemon/configure.ac

 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.65])
-AC_INIT([sflphone],[1.0.1],[sflphoneteam@savoirfairelinux.com],[sflphone])
-AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011]])
+AC_INIT([sflphone],[1.0.2],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012]])
 AC_REVISION([$Revision$])
 
 AC_CANONICAL_BUILD
@@ -17,21 +16,13 @@ AC_CONFIG_HEADERS([config.h])
 # Silent build by default. Use make V=1 to increase verbosity
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-dnl Rewrite name of programs to be installed
-dnl AC_ARG_PROGRAM
-
-dnl Compute canonical system name
-dnl AC_CANONICAL_TARGET
-
 dnl Improve make variable MAKE
 AC_PROG_MAKE_SET
 
 dnl Where to find configure files
-dnl AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl What to generate
-dnl AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([libs/Makefile \
 		libs/utilspp/Makefile \
@@ -53,16 +44,14 @@ AC_CONFIG_FILES([src/Makefile \
 		src/hooks/Makefile \
 		src/history/Makefile])
 
-dnl Unitary test section
+dnl Unit tests section
 AC_CONFIG_FILES([test/Makefile])
 
 AC_CONFIG_FILES([ringtones/Makefile])
 
 AC_CONFIG_FILES([man/Makefile])
 
-AC_CONFIG_FILES([doc/Makefile \
-		doc/dbus-api/Makefile \
-		doc/doxygen/Makefile])
+AC_CONFIG_FILES([doc/Makefile doc/dbus-api/Makefile doc/doxygen/Makefile])
 
 dnl Check for programs
 AC_PROG_CC
@@ -81,8 +70,8 @@ AC_LANG(C++)
 dnl Check for header files
 AC_FUNC_ALLOCA
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h \
-        memory.h netdb.h netinet/in.h stdlib.h string.h strings.h \
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h memory.h \
+                  netdb.h netinet/in.h stdlib.h string.h strings.h \
                   sys/ioctl.h sys/socket.h sys/time.h unistd.h utime.h ostream])
 
 dnl Check for typedefs, structures, and compiler characteristics
@@ -123,19 +112,12 @@ AC_FUNC_STAT
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \
-		inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \
-		strchr strdup strerror strrchr strstr strtol utime])
+                inet_ntoa memset mkdir pathconf pow regcomp select setlocale \
+                socket strchr strdup strerror strrchr strstr strtol utime])
 
 dnl Check for GNU ccRTP
 PKG_PROG_PKG_CONFIG
 
-dnl Trying to set PJSIP using pkg-config
-dnl PKG_CHECK_MODULES(SIP, libpj-sfl, have_libpj=true, have_libpj=false)
-dnl if test "x${have_libpj}" = "xfalse" ; then
-dnl    AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
-dnl fi
-dnl AC_SUBST(SIP_CFLAGS)
-
 dnl Check for uuid development package - name: uuid-dev
 UUID_MIN_VERSION=1.0
 PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
@@ -209,7 +191,6 @@ AC_CHECK_LIB([pthread], pthread_create,
 
 test "$have_pthread" = "false" && AC_MSG_ERROR([You need the POSIX Thread library (pthreads)])	
 
-
 AC_CHECK_LIB([pcre], pcre_free,
 		[AC_CHECK_HEADERS(pcre.h, have_pcre=true, have_pcre=false)],
 		have_pcre=false)
@@ -227,11 +208,8 @@ PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUI
 
 # check for libgsm1 (doesn't use pkg-config)
 	dnl Check for libgsm
-AC_ARG_WITH([gsm],
-		[AS_HELP_STRING([--without-gsm],
-			[disable support for gsm codec])],
-		[],
-		[with_gsm=yes])
+AC_ARG_WITH([gsm], [AS_HELP_STRING([--without-gsm],
+			[disable support for gsm codec])], [], [with_gsm=yes])
 
 LIBGSM=
 AS_IF([test "x$with_gsm" != xno],
@@ -268,7 +246,6 @@ dnl check in case the libspeexdsp is not installed
 AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the libspeexdsp headers (you may need to install the libspeexdsp-dev package) used for Noise Suppression and Automatic Gain Control.]))
 AC_CHECK_LIB(speexdsp, speex_preprocess_run, [], [], [])
 
-
 # check for libcelt
 AC_ARG_WITH([celt],
 		[AS_HELP_STRING([--without-celt],
@@ -292,27 +269,19 @@ AS_IF([test "x$with_celt" != xno],
     	])]
 )
 
-# AC_SUBST(BUILD_CELT)
-# AM_CONDITIONAL(BUILD_CELT, test "x$with_celt" = "xyes" )
 AM_CONDITIONAL(BUILD_CELT_91, test "x$with_celt_91" = "xyes" )
 AM_CONDITIONAL(BUILD_CELT_71, test "x$with_celt_71" = "xyes" )
 
-
 dnl Check for IAX
-AC_ARG_WITH([iax2],
-		[AS_HELP_STRING([--without-iax2],
-			[disable support for the iax2 protocol])],
-		[],
-		[with_iax2=yes])
+AC_ARG_WITH([iax2], [AS_HELP_STRING([--without-iax2],
+            [disable support for the iax2 protocol])], [], [with_iax2=yes])
 
 AC_DEFINE_UNQUOTED([HAVE_IAX], `if test "x$with_iax2" = "xyes"; then echo 1; else echo 0;fi`, [Define if you have libiax2])
 AM_CONDITIONAL(USE_IAX, test "x$with_iax2" = "xyes" )
 
 	dnl Check for network-manager
-AC_ARG_WITH([networkmanager],
-		[AS_HELP_STRING([--without-networkmanager],
-			[disable support for network-manager events])],
-		[],
+AC_ARG_WITH([networkmanager], [AS_HELP_STRING([--without-networkmanager],
+			[disable support for network-manager events])], [],
             [with_networkmanager=yes])
 
 AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" )