From ac3950583a4f31fe033cf75197e23e6854cd20ed Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Tue, 17 May 2011 17:06:39 -0500 Subject: [PATCH] Fix table properties that return objects --- atspi/atspi-misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index 720970a..22004ce 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -1019,6 +1019,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, DBusError err; dbus_bool_t retval = FALSE; AtspiObject *aobj = ATSPI_OBJECT (obj); + char expected_type = (type [0] == '(' ? 'r' : type [0]); if (!aobj) return FALSE; @@ -1066,7 +1067,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, goto done; } dbus_message_iter_recurse (&iter, &iter_variant); - if (dbus_message_iter_get_arg_type (&iter_variant) != type[0]) + if (dbus_message_iter_get_arg_type (&iter_variant) != expected_type) { g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant)); goto done; -- 2.7.4