Merge branch 'master' into jbonjean

sflphone-common/libs/dbus-c++/src/connection.cpp

@@ -48,7 +48,8 @@ Connection::Private::Private(DBusBusType type)
 {
 	InternalError e;
 
-	conn = dbus_bus_get_private(type, e);
+	conn = dbus_bus_get(type, e);
+	// conn = dbus_bus_get_private(type, e);
 
 	if (e) throw Error(e);
 
@@ -190,9 +191,13 @@ Connection Connection::ActivationBus()
 Connection::Connection(const char *address, bool priv)
 {
 	InternalError e;
+
+	/*
 	DBusConnection *conn = priv 
 		? dbus_connection_open_private(address, e)
 		: dbus_connection_open(address, e);
+	*/
+	DBusConnection *conn = dbus_connection_open(address, e);
 		
 	if (e) throw Error(e);
 

tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog

-sflphone-client-gnome (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
+sflphone-client-gnome (0.9.5-SYSVER~snapshot1243396910) SYSTEM; urgency=low
 
-    ** SNAPSHOT 1243310516 **
+    ** SNAPSHOT 1243396910 **
 
+  * [#1317] Fixed pjsip lib dirs
+  * [#1317] Updated debian packaging for new pjsip configuration script
+  * [#1317] Switch to autogenerated guess and sub files
+  * [#1317] Updated pjsip inclusion in build system
+  * [#1317] Replaced pjsip guess and sub files
   * [#1317] Fixed compilation issues on opensuse 11
   * [#1505] account list seem to crash the application when clicking
     Apply very fast...
@@ -14,7 +19,9 @@ sflphone-client-gnome (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
     call.
   * [#1443] Client should not crash when receive an unexpected
     stateChanged signal
+  * [#1456] Added version dependancy handling
   * [#1426] Daemon crashes when get alsa plugin
+  * [#1422] Improved error messages
   * commit for merge
   * [#1424] Change logo in tray icon and put a different one when
     incoming call
@@ -77,7 +84,7 @@ sflphone-client-gnome (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
   * Config Dialog almost finished.
   * Base of QT client
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 26 May 2009 00:02:37 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Wed, 27 May 2009 00:02:36 -0400
 
 sflphone-client-gnome (0.9.5-SYSVER) SYSTEM; urgency=low
 

tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog

-sflphone-common (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
+sflphone-common (0.9.5-SYSVER~snapshot1243396910) SYSTEM; urgency=low
 
-    ** SNAPSHOT 1243310516 **
+    ** SNAPSHOT 1243396910 **
 
+  * [#1317] Fixed pjsip lib dirs
+  * [#1317] Updated debian packaging for new pjsip configuration script
+  * [#1317] Switch to autogenerated guess and sub files
+  * [#1317] Updated pjsip inclusion in build system
+  * [#1317] Replaced pjsip guess and sub files
   * [#1317] Fixed compilation issues on opensuse 11
   * [#1505] account list seem to crash the application when clicking
     Apply very fast...
@@ -14,7 +19,9 @@ sflphone-common (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
     call.
   * [#1443] Client should not crash when receive an unexpected
     stateChanged signal
+  * [#1456] Added version dependancy handling
   * [#1426] Daemon crashes when get alsa plugin
+  * [#1422] Improved error messages
   * commit for merge
   * [#1424] Change logo in tray icon and put a different one when
     incoming call
@@ -77,7 +84,7 @@ sflphone-common (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
   * Config Dialog almost finished.
   * Base of QT client
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 26 May 2009 00:02:17 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Wed, 27 May 2009 00:02:13 -0400
 
 sflphone-common (0.9.5-SYSVER) SYSTEM; urgency=low