diff options
| author | Mike Gorse <mgorse@boston.site> | 2009-04-15 08:44:11 -0500 |
|---|---|---|
| committer | Mark Doffman <mdoff@silver-wind.(none)> | 2009-04-21 17:16:02 +0100 |
| commit | 5dc9ddd701fd95dcce8888f75fd2236062947424 (patch) | |
| tree | c203dc6cec5c59cfad8ca2d86d724de1ab3594c0 /droute | |
| parent | c767935ed5f324a9b498b78bd19c1b354aa06575 (diff) | |
| download | at-spi2-atk-5dc9ddd701fd95dcce8888f75fd2236062947424.tar.gz | |
2009-04-15 Mike Gorse <mgorse@novell.com>
* atk-adaptor/accessible-marshaller.c: Return SPI_DBUS_PATH_NULL
for a NULL object.
Fix call to dbus_message_iter_append_basic.
* atk-adaptor/accessible-register.c:
* atk-adaptor/editabletext-adaptor.c: Have copyText return a value.
* atk-adaptor/editabletext-adaptor.c: Fix uninitialized variable in
getAttributeValue.
Fix parameter type in getBoundedRanges, and open the appropriate
container when returning a value.
* value-adaptor.c: Return variants to conform with Properties iface.
* droute/droute.c: Throw exception if get fails.
When setting a property, correctly initialize the iter before reading.
* registry/deviceeventcontroller.c: deviceListener ->
deviceEventListener.
* spi-common/spi-dbus.h: Set SPI_DBUS_PATH_NULL to
/org/freedesktop/atspi/accessible/null.
Diffstat (limited to 'droute')
| -rw-r--r-- | droute/droute.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/droute/droute.c b/droute/droute.c index 5b749ae..23365ef 100644 --- a/droute/droute.c +++ b/droute/droute.c @@ -323,7 +323,11 @@ impl_prop_GetSet (DBusMessage *message, reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - (prop_funcs->get) (&iter, datum); + if (!(prop_funcs->get) (&iter, datum)) + { + dbus_message_unref (reply); + reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Get failed"); + } } else if (!get && prop_funcs->set) { @@ -332,7 +336,7 @@ impl_prop_GetSet (DBusMessage *message, _DROUTE_DEBUG ("DRoute (handle prop Get): %s|%s on %s\n", pair.one, pair.two, pathstr); - dbus_message_iter_init_append (message, &iter); + dbus_message_iter_init (message, &iter); /* Skip the interface and property name */ dbus_message_iter_next(&iter); dbus_message_iter_next(&iter); |