hal: Branch 'master'

[Danny Kukawka]

 doc/spec/hal-spec-interfaces.xml |    2 +-
 hald/hald_dbus.h                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4021aa45fca2dce0ea90418d70a3c60d2b67a9a4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 11 11:42:04 2008 +0200

    fixed PropertyModified signal in SPEC and code
    
    Fixed PropertyModified signal in SPEC to do what the code already do
    and fixed function declaration of device_send_signal_property_modified()
    to do the same as the function is already used.
    
    This should fix fd.o bug #16427.

diff --git a/doc/spec/hal-spec-interfaces.xml b/doc/spec/hal-spec-interfaces.xml
index b77b3a4..25cc771 100644
--- a/doc/spec/hal-spec-interfaces.xml
+++ b/doc/spec/hal-spec-interfaces.xml
@@ -620,7 +620,7 @@ $ dbus-send --system --print-reply --dest=org.freedesktop.Hal \
         <tbody>
           <row>
             <entry>PropertyModified</entry>
-            <entry>Int num_changes, Array of struct {String property_name, Bool added, Bool removed}</entry>
+            <entry>Int num_changes, Array of struct {String property_name, Bool removed, Bool added}</entry>
             <entry>
               One or more properties on the device object have changed.
             </entry>
diff --git a/hald/hald_dbus.h b/hald/hald_dbus.h
index 3bc2d04..a6013c7 100644
--- a/hald/hald_dbus.h
+++ b/hald/hald_dbus.h
@@ -93,8 +93,8 @@ void device_send_signal_interface_lock_released (HalDevice *device, const char *
 
 void device_send_signal_property_modified (HalDevice *device,
 					   const char *key,
-					   dbus_bool_t removed,
-					   dbus_bool_t added);
+					   dbus_bool_t added,
+					   dbus_bool_t removed);
 void device_send_signal_condition (HalDevice *device,
 				   const char *condition_name,
 				   const char *condition_details);