Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-client-gnome/autogen.sh

-#!/bin/bash
+#!/bin/sh -e
 
-function autocmd()
-{
-    echo "Running ${1}..."
-        $* || {
-            echo "Error running ${1}"
-                exit 1
-        }
-}
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+[ ! -e m4 ] && mkdir m4
 
 gnome-doc-prepare --force
-
-autocmd libtoolize --force --copy
-autocmd aclocal
-autocmd autoheader
-autocmd autoconf -f
-autocmd automake --add-missing --force-missing --copy -Wall
-
+autoreconf --force --install --verbose -Wall -I m4

sflphone-client-gnome/configure.ac

@@ -58,7 +58,7 @@ PKG_CHECK_MODULES(DEPS,     \
     gtk+-2.0 >= 2.2         \
     glib-2.0 >= 2.2         \
     webkit-1.0              \
-    libebook-1.2 >= 1.4	\
+    libebook-1.2 >= 1.4     \ 
 	libgnomeui-2.0			\
 	gnome-doc-utils
 )

sflphone-client-gnome/src/config/preferencesdialog.c

@@ -468,7 +468,7 @@ GtkTreeModel* createModel()
             gdk_pixbuf_unref (pixbuf);
         } else {
             DEBUG ("Couldn't load icon: %s", error->message);
-            g_error_free (error);
+            g_clear_error (&error);
         }
     }
 

sflphone-common/autogen.sh

-#!/bin/bash
+#!/bin/sh -e
 
-function autocmd()
-{
-    echo "Running ${1}..."
-        $* || {
-            echo "Error running ${1}"
-                exit 1
-        }
-}
-
-autocmd libtoolize --force --copy
-autocmd aclocal
-autocmd autoheader
-autocmd autoconf -f
-autocmd automake --add-missing --force-missing --copy -Wall
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+[ ! -e m4 ] && mkdir m4
 
+autoreconf --force --install --verbose -Wall -I m4

sflphone-common/globals.mak

@@ -74,5 +74,5 @@ AM_CPPFLAGS = \
 indent:
 	@echo "Indenting code:"
 	if [ -f $(ASTYLERC) ] ; then \
-		find $(top_srcdir)/src/ -regex ".*\.\(h\|cpp\)" -exec $(indent) --options=$(ASTYLERC) {} \; ; \
+                find $(top_srcdir)/src/ -name \*.cpp -o -name \*.h | xargs $(indent) --options=$(ASTYLERC) ; \
 	fi

sflphone-common/src/audio/echocancel.cpp

@@ -30,7 +30,7 @@
 
 #include "echocancel.h"
 
-// #include <fstream>
+#include <cmath>
 
 EchoCancel::EchoCancel (int smplRate, int frameLength) : _samplingRate (smplRate),
     _frameLength (frameLength),