Use deputy object sent by "GetNavigableAtPoint"

[platform/upstream/at-spi2-core.git] / atspi / atspi-misc.c

diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index c6b4581..193257b 100644 (file)
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -598,54 +598,31 @@ _atspi_ref_accessible (const char *app, const char *path)
   return ref_accessible (app, path);
 }
 
-static AtspiAccessible *
-_atspi_dbus_return_accessible_and_recurse_info_from_message_impl (DBusMessage *message, unsigned char *recurse)
+AtspiAccessible *
+_atspi_dbus_return_accessible_from_message (DBusMessage *message)
 {
   DBusMessageIter iter;
   AtspiAccessible *retval = NULL;
   const char *signature;
-  const char *expected_signature = recurse ? "(so)y" : "(so)";
 
-  if (!message) return NULL;
+  if (!message)
+    return NULL;
 
   signature = dbus_message_get_signature (message);
-  if (!strcmp (signature, expected_signature))
+  if (!strcmp (signature, "(so)"))
   {
     dbus_message_iter_init (message, &iter);
     retval =  _atspi_dbus_return_accessible_from_iter (&iter);
-    if (recurse) {
-      unsigned char value = 0;
-      dbus_message_iter_get_basic (&iter, &value);
-      dbus_message_iter_next (&iter);
-      *recurse = (value != 0);
-    }
   }
   else
   {
-    g_warning ("AT-SPI: Called _atspi_dbus_return_accessible_from_message with unexpected signature %s", signature);
+    g_warning ("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s", signature);
   }
   dbus_message_unref (message);
   return retval;
 }
 
 AtspiAccessible *
-_atspi_dbus_return_accessible_from_message (DBusMessage *message)
-{
-  return _atspi_dbus_return_accessible_and_recurse_info_from_message_impl(message, NULL);
-}
-
-AtspiAccessible *
-_atspi_dbus_return_accessible_and_recurse_info_from_message(DBusMessage *message, unsigned char *recurse)
-{
-  if (recurse == NULL) {
-    g_error("AT-SPI: Called _atspi_dbus_return_accessible_and_recurse_info_from_message with NULL argument recurse");
-    dbus_message_unref (message);
-    return NULL;
-  }
-  return _atspi_dbus_return_accessible_and_recurse_info_from_message_impl(message, recurse);
-}
-
-AtspiAccessible *
 _atspi_dbus_return_accessible_from_iter (DBusMessageIter *iter)
 {
   const char *app_name, *path;