[maemo-commits] [maemo-commits] r8730 - in projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1: debian libossomime/ut obex-module/src obex-utils/obex-vfs-utils

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2006-12-12 16:14:16 +0200 (Tue, 12 Dec 2006)
New Revision: 8730

Modified:
   projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/debian/changelog
   projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/libossomime/ut/test-ossomime.c
   projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-module/src/om-dbus.c
   projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-utils/obex-vfs-utils/ovu-xfer.c
Log:
fix


Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/debian/changelog
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/debian/changelog	2006-12-12 14:13:31 UTC (rev 8729)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/debian/changelog	2006-12-12 14:14:16 UTC (rev 8730)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.8.1-2kh1) unstable; urgency=low
+
+  * Fixed D-Bus porting brain-damage...
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 12 Dec 2006 16:10:43 +0200
+
 osso-gnomevfs-extra (1.8.1-2kh) unstable; urgency=low
 
   * Ported for D-Bus 1.0 (so that Sardine can work).

Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/libossomime/ut/test-ossomime.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/libossomime/ut/test-ossomime.c	2006-12-12 14:13:31 UTC (rev 8729)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/libossomime/ut/test-ossomime.c	2006-12-12 14:14:16 UTC (rev 8730)
@@ -100,5 +100,6 @@
 static void _dbus_disconnect(DBusConnection *conn)
 {
     assert(conn != NULL);
+    dbus_connection_close(conn);
     dbus_connection_unref(conn);
 }

Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-module/src/om-dbus.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-module/src/om-dbus.c	2006-12-12 14:13:31 UTC (rev 8729)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-module/src/om-dbus.c	2006-12-12 14:14:16 UTC (rev 8730)
@@ -90,6 +90,7 @@
 static void
 connection_free (Connection *conn)
 {
+	dbus_connection_close (conn->dbus_conn);
 	dbus_connection_unref (conn->dbus_conn);
 	
 	g_main_loop_unref (conn->loop);

Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-utils/obex-vfs-utils/ovu-xfer.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-utils/obex-vfs-utils/ovu-xfer.c	2006-12-12 14:13:31 UTC (rev 8729)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.1-2kh1/obex-utils/obex-vfs-utils/ovu-xfer.c	2006-12-12 14:14:16 UTC (rev 8730)
@@ -85,6 +85,7 @@
 	if (!dbus_bus_register (conn, &error)) {
                 g_warning ("Failed to register with the D-BUS daemon: %s", error.message);
 		
+                dbus_connection_close (conn);
                 dbus_connection_unref (conn);
 
                 dbus_error_free (&error);
@@ -97,6 +98,7 @@
 static void
 xfer_wrapper_free (XferWrapper *wrapper)
 {
+	dbus_connection_close (wrapper->conn);
 	dbus_connection_unref (wrapper->conn);
 	
 	g_free (wrapper->current_filename);