aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'hal-0.5.11-patches/0020-fix-DBus-introspection-for-org.freedesktop.Hal.Manag.patch')
-rw-r--r--hal-0.5.11-patches/0020-fix-DBus-introspection-for-org.freedesktop.Hal.Manag.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/hal-0.5.11-patches/0020-fix-DBus-introspection-for-org.freedesktop.Hal.Manag.patch b/hal-0.5.11-patches/0020-fix-DBus-introspection-for-org.freedesktop.Hal.Manag.patch
new file mode 100644
index 00000000..48d21129
--- /dev/null
+++ b/hal-0.5.11-patches/0020-fix-DBus-introspection-for-org.freedesktop.Hal.Manag.patch
@@ -0,0 +1,50 @@
+From 443b7649d5a1daec09f1ed34907fa81fe0000459 Mon Sep 17 00:00:00 2001
+From: Danny Kukawka <danny.kukawka@web.de>
+Date: Mon, 25 Aug 2008 21:02:07 +0200
+Subject: [PATCH 20/48] 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.
+---
+ hald/hald_dbus.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+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"
+--
+1.6.1.2
+