[maemo-commits] [maemo-commits] r9118 - in projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh: debian libossomime/ut obex-module/src obex-utils/obex-vfs-utils

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-01-16 13:53:53 +0200 (Tue, 16 Jan 2007)
New Revision: 9118

Modified:
   projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/debian/changelog
   projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/libossomime/ut/test-ossomime.c
   projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-module/src/om-dbus.c
   projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-utils/obex-vfs-utils/ovu-xfer.c
Log:
some dbus porting..


Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/debian/changelog
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/debian/changelog	2007-01-16 11:50:59 UTC (rev 9117)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/debian/changelog	2007-01-16 11:53:53 UTC (rev 9118)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.8.2-1kh) unstable; urgency=low
+
+  * Ported for D-Bus 1.0 API for Sardine. Still Fixes: NB#50390
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 16 Jan 2007 13:53:09 +0200
+
 osso-gnomevfs-extra (1.8.2-1) unstable; urgency=low
 
   * Fixes: NB#50390, Wrong date on files copied from device to S60 phones

Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/libossomime/ut/test-ossomime.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/libossomime/ut/test-ossomime.c	2007-01-16 11:50:59 UTC (rev 9117)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/libossomime/ut/test-ossomime.c	2007-01-16 11:53:53 UTC (rev 9118)
@@ -100,6 +100,6 @@
 static void _dbus_disconnect(DBusConnection *conn)
 {
     assert(conn != NULL);
-    dbus_connection_disconnect(conn);
+    dbus_connection_close(conn);
     dbus_connection_unref(conn);
 }

Modified: projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-module/src/om-dbus.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-module/src/om-dbus.c	2007-01-16 11:50:59 UTC (rev 9117)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-module/src/om-dbus.c	2007-01-16 11:53:53 UTC (rev 9118)
@@ -90,7 +90,7 @@
 static void
 connection_free (Connection *conn)
 {
-	dbus_connection_disconnect (conn->dbus_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.2-1kh/obex-utils/obex-vfs-utils/ovu-xfer.c
===================================================================
--- projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-utils/obex-vfs-utils/ovu-xfer.c	2007-01-16 11:50:59 UTC (rev 9117)
+++ projects/haf/tags/osso-gnomevfs-extra/1.8.2-1kh/obex-utils/obex-vfs-utils/ovu-xfer.c	2007-01-16 11:53:53 UTC (rev 9118)
@@ -85,7 +85,7 @@
 	if (!dbus_bus_register (conn, &error)) {
                 g_warning ("Failed to register with the D-BUS daemon: %s", error.message);
 		
-                dbus_connection_disconnect (conn);
+                dbus_connection_close (conn);
                 dbus_connection_unref (conn);
 
                 dbus_error_free (&error);
@@ -98,7 +98,7 @@
 static void
 xfer_wrapper_free (XferWrapper *wrapper)
 {
-	dbus_connection_disconnect (wrapper->conn);
+	dbus_connection_close (wrapper->conn);
 	dbus_connection_unref (wrapper->conn);
 	
 	g_free (wrapper->current_filename);