Fix a warning and an incorrect return value

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 6be26c6..99d98f3 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -280,7 +280,7 @@ spi_register_object_to_path (SpiRegister * reg, GObject * gobj)
     return NULL;
 
   /* Map the root object to the root path. */
-  if (gobj == spi_global_app_data->root)
+  if ((void *)gobj == (void *)spi_global_app_data->root)
     return g_strdup (spi_register_root_path);
 
   ref = object_to_ref (gobj);

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index c2c60e9..51aa4aa 100644 (file)
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -145,7 +145,7 @@ impl_get_ChildCount (DBusMessageIter * iter, void *user_data)
 
   g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE);
 
-  childCount = (ATK_IS_SOCKET (object) && atk_socket_is_occupied (object))
+  childCount = (ATK_IS_SOCKET (object) && atk_socket_is_occupied (ATK_SOCKET (object)))
                ? 1
                : atk_object_get_n_accessible_children (object);
   return droute_return_v_int32 (iter, childCount);

diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
index a0e16ad..5be3b54 100644 (file)
--- a/atk-adaptor/adaptors/component-adaptor.c
+++ b/atk-adaptor/adaptors/component-adaptor.c
@@ -87,7 +87,7 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
   reply = spi_object_return_reference (message, child);
   g_object_unref (child);
 
-  return child;
+  return reply;
 }
 
 static DBusMessage *