[maemo-commits] [maemo-commits] r8810 - in projects/haf/trunk/osso-gnome-vfs2: . dbus-daemon debian

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Dec 19 11:03:24 EET 2006 
Author: richard
Date: 2006-12-19 11:03:22 +0200 (Tue, 19 Dec 2006)
New Revision: 8810

Modified:
   projects/haf/trunk/osso-gnome-vfs2/ChangeLog
   projects/haf/trunk/osso-gnome-vfs2/configure.in
   projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c
   projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/dbus-method.c
   projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/vfs-daemon.c
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/control
Log:
Revert changes.

Modified: projects/haf/trunk/osso-gnome-vfs2/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2006-12-19 09:03:22 UTC (rev 8810)
@@ -1,3 +1,14 @@
+2006-12-19  Richard Hult  <richard at imendio.com>
+
+	* configure.in: Bump version.
+
+	* dbus-daemon/daemon-connection.c: (connection_unref):
+	* dbus-daemon/dbus-method.c: (ensure_connection),
+	(vfs_module_shutdown):
+	* dbus-daemon/vfs-daemon.c: (daemon_get_connection),
+	(daemon_shutdown): Revert the last commit since we don't want that
+	in this branch.
+
 2006-12-12  Richard Hult  <richard at imendio.com>
 
 	* Release 2.12.0.18
@@ -34,7 +45,7 @@
 	* configure.in: Bump version.
 
 	* libgnomevfs/gnome-vfs-mime-monitor.h: 
-	* libgnomevfs/gnome-vfs-mime-monitor.c: Upstream relicensed those
+	* libgnomevfs/gnome-vfs-mime-monitor.c: Upstream relicense those
 	files to LGPL, do the same here.
 
 2006-10-06  Richard Hult  <richard at imendio.com>

Modified: projects/haf/trunk/osso-gnome-vfs2/configure.in
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/configure.in	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/configure.in	2006-12-19 09:03:22 UTC (rev 8810)
@@ -14,7 +14,7 @@
 
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
-LIBGNOMEVFS_EXTRAVERSION=18
+LIBGNOMEVFS_EXTRAVERSION=19
 
 dnl libtool versioning from libgnome
 

Modified: projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c	2006-12-19 09:03:22 UTC (rev 8810)
@@ -321,7 +321,7 @@
 	d(g_print ("Last unref\n"));
 
 	if (dbus_connection_get_is_connected (conn->conn)) {
-		dbus_connection_close (conn->conn);
+		dbus_connection_disconnect (conn->conn);
 	}
 	dbus_connection_unref (conn->conn);
 

Modified: projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/dbus-method.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/dbus-method.c	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/dbus-method.c	2006-12-19 09:03:22 UTC (rev 8810)
@@ -223,7 +223,7 @@
 	if (!dbus_connection_add_filter (dbus_conn, message_handler,
 					 NULL, NULL)) {
 		g_warning ("Failed to add filter to the connection.");
-		dbus_connection_close (dbus_conn);
+		dbus_connection_disconnect (dbus_conn);
 		dbus_connection_unref (dbus_conn);
 
 		dbus_conn = NULL;
@@ -1702,7 +1702,7 @@
 vfs_module_shutdown (GnomeVFSMethod* method)
 {
 	if (dbus_conn) {
-		dbus_connection_close (dbus_conn);
+		dbus_connection_disconnect (dbus_conn);
 		dbus_connection_unref (dbus_conn);
 
 		dbus_conn = NULL;

Modified: projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/vfs-daemon.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/vfs-daemon.c	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/vfs-daemon.c	2006-12-19 09:03:22 UTC (rev 8810)
@@ -91,7 +91,7 @@
 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
 		dbus_error_free (&error);
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -101,7 +101,7 @@
 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
 		g_printerr ("VFS daemon already running, exiting.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -111,7 +111,7 @@
 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_printerr ("Not primary owner of the service, exiting.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -124,7 +124,7 @@
 						   NULL)) {
 		g_printerr ("Failed to register object with D-BUS.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -152,7 +152,7 @@
 		return;
 	}
 
-	dbus_connection_close (conn);
+	dbus_connection_disconnect (conn);
 	dbus_connection_unref (conn);
 }
 

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2006-12-19 09:03:22 UTC (rev 8810)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.12.0.19-2osso1) unstable; urgency=low
+
+  * Revert the change in .18 since we don't want that in this branch
+
+ -- Richard Hult <richard at imendio.com>  Tue, 19 Dec 2006 09:59:57 +0100
+
 osso-gnome-vfs2 (2.12.0.18-2osso1) unstable; urgency=low
 
   * Remove unsed osso-gwconnect dependency

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/control
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/control	2006-12-19 08:53:26 UTC (rev 8809)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/control	2006-12-19 09:03:22 UTC (rev 8810)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), osso-gwconnect-dev (>= 0.62), gtk-doc-tools
 Standards-Version: 3.6.1.0
 
 Package: libosso-gnomevfs2-common
More information about the maemo-commits mailing list