projects
/
platform
/
upstream
/
at-spi2-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
856aa41
)
Fix table properties that return objects
author
Mike Gorse
<mgorse@novell.com>
Tue, 17 May 2011 22:06:39 +0000
(17:06 -0500)
committer
Mike Gorse
<mgorse@novell.com>
Tue, 17 May 2011 22:06:39 +0000
(17:06 -0500)
atspi/atspi-misc.c
patch
|
blob
|
history
diff --git
a/atspi/atspi-misc.c
b/atspi/atspi-misc.c
index
720970a
..
22004ce
100644
(file)
--- 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);
DBusError err;
dbus_bool_t retval = FALSE;
AtspiObject *aobj = ATSPI_OBJECT (obj);
+ char expected_type = (type [0] == '(' ? 'r' : type [0]);
if (!aobj)
return FALSE;
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);
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;
{
g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant));
goto done;