Release v2.7.3

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / adaptors / socket-adaptor.c

diff --git a/atk-adaptor/adaptors/socket-adaptor.c b/atk-adaptor/adaptors/socket-adaptor.c
index 1b57fc6..d7ebe5f 100644 (file)
--- a/atk-adaptor/adaptors/socket-adaptor.c
+++ b/atk-adaptor/adaptors/socket-adaptor.c
@@ -25,8 +25,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 #include "object.h"
 #include "introspection.h"
 #include "bridge.h"
@@ -49,7 +49,7 @@ new_socket_call_message (AtkComponent *component, const char *member)
       DBusMessage *message;
       *(path_parent++) = '\0';
       message = dbus_message_new_method_call (bus_parent, path_parent,
-                                              SPI_DBUS_INTERFACE_COMPONENT,
+                                              ATSPI_DBUS_INTERFACE_COMPONENT,
                                               member);
       g_free (bus_parent);
       return message;
@@ -78,9 +78,9 @@ atspi_plug_component_get_extents (AtkComponent *component, gint *x, gint *y,
   if (!reply)
     return;
   signature = dbus_message_get_signature (reply);
-  if (strcmp (signature, "(iiii)") != 0)
+  if (g_strcmp0 (signature, "(iiii)") != 0)
   {
-    g_warning ("Got unexpected signature %s from GetExtents: %s\n", signature);
+    g_warning ("Got unexpected signature %s from GetExtents\n", signature);
     dbus_message_unref (reply);
     return;
   }
@@ -187,6 +187,12 @@ impl_Embedded (DBusConnection *bus,
       iface->get_size = atspi_plug_component_get_size;
       iface->get_position = atspi_plug_component_get_position;
     }
+
+  /* Retrieve some info about the children, if they exist, when
+     embedding the plug to ensure the a11y subtree is generated.
+     https://bugzilla.gnome.org/show_bug.cgi?id=663876 */
+  atk_object_get_n_accessible_children (object);
+
   return dbus_message_new_method_return (message);
 }
 
@@ -199,7 +205,7 @@ void
 spi_initialize_socket (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_SOCKET,
+                             ATSPI_DBUS_INTERFACE_SOCKET,
                              NULL, /* spi_org_a11y_atspi_Socket,        */
                              methods, NULL);
 };