D-Bus API change

Frederic Peters fpeters at 0d.be
Thu Jul 13 13:34:02 PDT 2006


Hello,

With the volume_id patch applied, HAL was built on
  http://jhbuild.bxlug.be/builds/2006-07-13-0003/logs/hal/#build
and so it seems it has not yet been fixed for latest (last) D-BUS
API change. (see http://www.j5live.com/?p=231)

Trivial patch attached.


        Frederic
-------------- next part --------------
Index: tools/hal-device.c
===================================================================
RCS file: /cvs/hal/hal/tools/hal-device.c,v
retrieving revision 1.5
diff -u -r1.5 hal-device.c
--- tools/hal-device.c	12 May 2006 14:34:28 -0000	1.5
+++ tools/hal-device.c	13 Jul 2006 20:27:30 -0000
@@ -155,7 +155,7 @@
 
 	libhal_ctx_shutdown(hal_ctx, &error);
 	libhal_ctx_free(hal_ctx);
-	dbus_connection_disconnect(conn);
+	dbus_connection_close(conn);
 	dbus_connection_unref(conn);
 	dbus_error_free(&error);
 
Index: tools/lshal.c
===================================================================
RCS file: /cvs/hal/hal/tools/lshal.c,v
retrieving revision 1.20
diff -u -r1.20 lshal.c
--- tools/lshal.c	5 Mar 2006 00:41:50 -0000	1.20
+++ tools/lshal.c	13 Jul 2006 20:27:30 -0000
@@ -705,7 +705,7 @@
 	libhal_ctx_shutdown (hal_ctx, &error);
 	libhal_ctx_free (hal_ctx);
 
-	dbus_connection_disconnect (conn);
+	dbus_connection_close (conn);
 	dbus_connection_unref (conn);
 
 	if (show_device)


More information about the hal mailing list