hal: Branch 'master'

[Danny Kukawka]

 hald/hald_dbus.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 75ad1d5d4e293add7ccbb8d5b7cacbebe0102bd7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 25 21:02:07 2008 +0200

    fix DBus introspection for org.freedesktop.Hal.Manager
    
    Fixed DBus introspection for org.freedesktop.Hal.Manager.
    Some methodes used as argument type object path (ao/oa/o) but
    the code used DBUS_TYPE_STRING_AS_STRING or DBUS_TYPE_STRING.
    
    Changed the introspection code to use string as type to prevent
    API breakages, since everyone use currently what the code says.

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 51dd7ae..697fb75 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -4445,22 +4445,22 @@ do_introspect (DBusConnection  *connection,
 		xml = g_string_append (xml,
 				       "  <interface name=\"org.freedesktop.Hal.Manager\">\n"
 				       "    <method name=\"GetAllDevices\">\n"
-				       "      <arg name=\"devices\" direction=\"out\" type=\"ao\"/>\n"
+				       "      <arg name=\"devices\" direction=\"out\" type=\"as\"/>\n"
 				       "    </method>\n"
 				       "    <method name=\"GetAllDevicesWithProperties\">\n"
-				       "      <arg name=\"devices_with_props\" direction=\"out\" type=\"a(oa{sv})\"/>\n"
+				       "      <arg name=\"devices_with_props\" direction=\"out\" type=\"a(sa{sv})\"/>\n"
 				       "    </method>\n"
 				       "    <method name=\"DeviceExists\">\n"
 				       "      <arg name=\"does_it_exist\" direction=\"out\" type=\"b\"/>\n"
-				       "      <arg name=\"udi\" direction=\"in\" type=\"o\"/>\n"
+				       "      <arg name=\"udi\" direction=\"in\" type=\"s\"/>\n"
 				       "    </method>\n"
 				       "    <method name=\"FindDeviceStringMatch\">\n"
-				       "      <arg name=\"devices\" direction=\"out\" type=\"ao\"/>\n"
+				       "      <arg name=\"devices\" direction=\"out\" type=\"as\"/>\n"
 				       "      <arg name=\"key\" direction=\"in\" type=\"s\"/>\n"
 				       "      <arg name=\"value\" direction=\"in\" type=\"s\"/>\n"
 				       "    </method>\n"
 				       "    <method name=\"FindDeviceByCapability\">\n"
-				       "      <arg name=\"devices\" direction=\"out\" type=\"ao\"/>\n"
+				       "      <arg name=\"devices\" direction=\"out\" type=\"as\"/>\n"
 				       "      <arg name=\"capability\" direction=\"in\" type=\"s\"/>\n"
 				       "    </method>\n"
 				       "    <method name=\"NewDevice\">\n"