From 4fc7babf4b601e69dcb52b40f51a042934b2e430 Mon Sep 17 00:00:00 2001 From: Mark Doffman Date: Wed, 3 Feb 2010 14:53:07 -0800 Subject: [PATCH] Fix error where null objects were sent with wrong address. Fix duplicate line in table adaptor header generation. --- atk-adaptor/adaptors/table-adaptor.c | 3 +-- atk-adaptor/object.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/atk-adaptor/adaptors/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c index b61caa2..4d9c438 100644 --- a/atk-adaptor/adaptors/table-adaptor.c +++ b/atk-adaptor/adaptors/table-adaptor.c @@ -319,7 +319,7 @@ impl_GetRowHeader (DBusConnection * bus, DBusMessage * message, AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; DBusError error; - AtkObject *obj; + AtkObject *obj = NULL; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); @@ -330,7 +330,6 @@ impl_GetRowHeader (DBusConnection * bus, DBusMessage * message, return droute_invalid_arguments_error (message); } obj = atk_table_get_row_header (table, row); - obj = atk_table_get_row_header (table, row); return spi_object_return_reference (message, obj); } diff --git a/atk-adaptor/object.c b/atk-adaptor/object.c index ebaf4e5..f495323 100644 --- a/atk-adaptor/object.c +++ b/atk-adaptor/object.c @@ -78,7 +78,7 @@ spi_object_append_null_reference (DBusMessageIter * iter) { DBusMessageIter iter_struct; const char *name; - const char *path = "/org/at_spi/null"; + const char *path = SPI_DBUS_PATH_NULL; name = dbus_bus_get_unique_name (spi_global_app_data->bus); -- 2.7.4