Merge branch 'master' into qt-client

sflphone-client-gnome/src/uimanager.c

@@ -362,8 +362,7 @@ help_contents_cb(GtkAction *action)
   GError *error = NULL;
 
   gnome_help_display("sflphone.xml", NULL, &error);
-  if (error != NULL)
-    {
+  if (error != NULL) {
       g_warning("%s", error->message);
       g_error_free(error);
   }

sflphone-common/VERSION

-0.9.8~beta
+0.9.8~rc1

sflphone-common/configure.ac

@@ -3,7 +3,7 @@ dnl
 
 	dnl Process this file with autoconf to produce a configure script.
 	AC_PREREQ(2.59)
-	AC_INIT([sflphone],[0.9.8~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_INIT([sflphone],[0.9.8~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
 	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 

sflphone-common/libs/dbus-c++/src/Makefile.am

@@ -34,10 +34,12 @@ HEADER_FILES = \
 	$(HEADER_DIR)/eventloop-integration.h \
 	$(GLIB_H)
 
+
+
 # noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
 noinst_HEADERS = $(HEADER_FILES)
 
-pkglib_LTLIBRARIES = libdbus-c++-1.la
+noinst_LTLIBRARIES = libdbus-c++-1.la
 libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP)
 libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS)
 

sflphone-common/src/Makefile.am

@@ -78,6 +78,7 @@ noinst_HEADERS = \
 libsflphone_la_LIBADD = \
 	$(src)/libs/utilspp/libutilspp.la \
 	$(src)/libs/iax2/libiax2.la \
+	$(src)/libs/dbus-c++/src/libdbus-c++-1.la \
 	$(IAX_LIB) \
 	./sip/libsiplink.la \
 	./audio/libaudio.la \