hal: Branch 'origin'

[David Zeuthen]

 hald/hald_dbus.c                |   15 +++++++++------
 libhal-storage/libhal-storage.c |   12 ++++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
diff-tree 5c805a264429fd58a18ce8233a1cefd96f10ea99 (from fbf31cf6300695958a3a936ed3a90619d5af84a2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Feb 20 18:40:14 2007 +0100

    fix (more) gtk-doc code documentation
    
    Fixed the gtk-doc code documentation by replace docbook style to
    avoid error messages while build.

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 32a58b1..c40a1df 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -4225,14 +4225,17 @@ no_caller:
 	return osspec_filter_function (connection, message, user_data);
 }
 
-/** Message handler for method invocations. All invocations on any object
+/**  
+ *  hald_dbus_filter_function:
+ *  @connection:          D-BUS connection
+ *  @message:             Message
+ *  @user_data:           User data
+ *
+ *  Returns:              What to do with the message
+ *
+ *  Message handler for method invocations. All invocations on any object
  *  or interface is routed through this function. *ONLY* messages from the
  *  system bus goes through this method.
- *
- *  @param  connection          D-BUS connection
- *  @param  message             Message
- *  @param  user_data           User data
- *  @return                     What to do with the message
  */
 DBusHandlerResult
 hald_dbus_filter_function (DBusConnection * connection,
diff --git a/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c
index 087dfeb..cc00a74 100644
--- a/libhal-storage/libhal-storage.c
+++ b/libhal-storage/libhal-storage.c
@@ -1379,11 +1379,14 @@ out:
 }
 
 
-/** Get the volume object for a given mount point
+/** 
+ *  libhal_volume_from_mount_point:
+ *  @hal_ctx:             libhal context to use
+ *  @device_file:         Name of mount point without terminting slash, e.g. '/media/disk'
+ * 
+ *  Returns:              LibHalVolume object or NULL if it doesn't exist
  *
- *  @param  hal_ctx             libhal context to use
- *  @param  device_file         Name of mount point without terminting slash, e.g. '/media/disk'
- *  @return                     LibHalVolume object or NULL if it doesn't exist
+ *  Get the volume object for a given mount point 
  */
 LibHalVolume *
 libhal_volume_from_mount_point              (LibHalContext *hal_ctx, 
@@ -1430,6 +1433,7 @@ out:
  *  libhal_volume_from_device_file:
  *  @hal_ctx:            libhal context to use
  *  @device_file:        Name of special device file, e.g. '/dev/hda5'
+ *
  *  Returns:             LibHalVolume object or NULL if it doesn't exist
  *
  *  Get the volume object for a given device file.