hal/libhal libhal.c,1.56,1.57 libhal.h,1.31,1.32

[David Zeuthen]

Update of /cvs/hal/hal/libhal
In directory gabe:/tmp/cvs-serv15287/libhal

Modified Files:
	libhal.c libhal.h 
Log Message:
2006-02-12  David Zeuthen  <davidz at redhat.com>

        * tools/hal-system-storage-unmount (MOUNT_POINT): Attempt to use
        volume.mount_point if we cannot find
        info.hal_mount.created_mount_point

        * libhal/libhal.h: Export prototype for new function
        libhal_ctx_get_dbus_connection()

        * libhal/libhal.c (libhal_ctx_get_dbus_connection): New function

        * hald/linux2/addons/addon-storage.c (force_unmount): Use a the
        Unmount() hal method to lazy unmount

        * hald/linux2/osspec.c (hald_udev_data): Ugh ugh ugh.. clear
        buffer before receiving data from udev.. we didn't use to do this
        and we got all sorts of weird side-effects since we'd for instance
        pick up DEVNAME='/dev/sdb' and _then_ DEVNAME='/dev/sda1' for
        /sys/block/sdb.. This was because this data was left in the buffer
        from the old run. It now appears to work..

        * hald/linux2/blockdev.c (force_unmount_cb): New function, pass
        end_token to hal_util_callout_device_remove()
        (force_unmount): Use the Unmount method call to lazy unmount, thus
        making sure we don't block
        (hotplug_event_begin_remove_blockdev): Pass end_token to force_unmount
        and let that function invoke hal_util_callout_device_remove()

        * hald/hald_dbus.c (hald_exec_method_cb, hald_exec_method): Make
        this work for helpers using a direct connection to hald
        (hald_dbus_filter_handle_methods): Pass local_interface to
        hald_exec_method

        * hald/valgrind-hald.sh, /debug-hald.sh: Update to use 'pwd' just
        like run-hald.sh was updated



Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- libhal.c	2 Nov 2005 15:38:14 -0000	1.56
+++ libhal.c	12 Feb 2006 21:47:28 -0000	1.57
@@ -2924,6 +2924,20 @@
 	return TRUE;
 }
 
+/** Get DBus connection to use to talk to hald.
+ *
+ *  @param  ctx                 Context to set connection for
+ *  @return conn                DBus connection to use or NULL
+ */
+DBusConnection *
+libhal_ctx_get_dbus_connection (LibHalContext *ctx)
+{
+	LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+
+	return ctx->connection;
+}
+
+
 /** Initialize the connection to hald
  *
  *  @param  ctx                 Context for connection to hald (connection

Index: libhal.h
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- libhal.h	2 Nov 2005 15:38:14 -0000	1.31
+++ libhal.h	12 Feb 2006 21:47:28 -0000	1.32
@@ -163,6 +163,9 @@
 /* Set DBus connection to use to talk to hald. */
 dbus_bool_t    libhal_ctx_set_dbus_connection          (LibHalContext *ctx, DBusConnection *conn);
 
+/* Get DBus connection to use to talk to hald. */
+DBusConnection *libhal_ctx_get_dbus_connection          (LibHalContext *ctx);
+
 /* Set user data for the context */
 dbus_bool_t    libhal_ctx_set_user_data                (LibHalContext *ctx, void *user_data);