Plug/socket fixes, and remove conditional

Always enable plug/socket code.  Bump atk requirement to 1.29.3 accordingly.
Fix cases where we were omitting the parent of a plug if it was unknown.

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index 844ab6a..2dd6cd7 100644 (file)
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -91,7 +91,6 @@ impl_get_Parent (DBusMessageIter * iter, void *user_data)
   parent = atk_object_get_parent (obj);
   if (parent == NULL)
     {
-#ifdef SPI_ATK_PLUG_SOCKET
       /* TODO, move in to a 'Plug' wrapper. */
       if (ATK_IS_PLUG (obj))
         {
@@ -102,22 +101,27 @@ impl_get_Parent (DBusMessageIter * iter, void *user_data)
           if (id)
             {
               bus_parent = g_strdup (id);
-            if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':')))
-              {
-                DBusMessageIter iter_parent;
-                *(path_parent++) = '\0';
-                dbus_message_iter_open_container (&iter_variant, DBUS_TYPE_STRUCT, NULL,
-                                                  &iter_parent);
-                dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent);
-                dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent);
-                dbus_message_iter_close_container (&iter_variant, &iter_parent);
-              }
+              if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':')))
+                {
+                  DBusMessageIter iter_parent;
+                  *(path_parent++) = '\0';
+                  dbus_message_iter_open_container (&iter_variant, DBUS_TYPE_STRUCT, NULL,
+                                                    &iter_parent);
+                  dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent);
+                  dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent);
+                  dbus_message_iter_close_container (&iter_variant, &iter_parent);
+                }
+              else
+                {
+                  spi_object_append_null_reference (&iter_variant);
+                }
+            }
+          else
+            {
+              spi_object_append_null_reference (&iter_variant);
             }
         }
       else if (role != Accessibility_ROLE_APPLICATION)
-#else
-      if (role != Accessibility_ROLE_APPLICATION)
-#endif
          spi_object_append_null_reference (&iter_variant);
       else
          spi_object_append_desktop_reference (&iter_variant);

diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c
index 31f39c8..e6f950c 100644 (file)
--- a/atk-adaptor/adaptors/cache-adaptor.c
+++ b/atk-adaptor/adaptors/cache-adaptor.c
@@ -98,7 +98,6 @@ append_cache_item (AtkObject * obj, gpointer data)
     parent = atk_object_get_parent (obj);
     if (parent == NULL)
       {
-#ifdef SPI_ATK_PLUG_SOCKET
         /* TODO, move in to a 'Plug' wrapper. */
         if (ATK_IS_PLUG (obj))
           {
@@ -109,22 +108,27 @@ append_cache_item (AtkObject * obj, gpointer data)
             if (id)
               {
                 bus_parent = g_strdup (id);
-              if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':')))
-                {
-                  DBusMessageIter iter_parent;
-                  *(path_parent++) = '\0';
-                  dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, NULL,
-                                                    &iter_parent);
-                  dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent);
-                  dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent);
-                  dbus_message_iter_close_container (&iter_struct, &iter_parent);
-                }
+                if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':')))
+                  {
+                    DBusMessageIter iter_parent;
+                    *(path_parent++) = '\0';
+                    dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, NULL,
+                                                      &iter_parent);
+                    dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent);
+                    dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent);
+                    dbus_message_iter_close_container (&iter_struct, &iter_parent);
+                  }
+                else
+                  {
+                    spi_object_append_null_reference (&iter_struct);
+                  }
+              }
+            else
+              {
+                spi_object_append_null_reference (&iter_struct);
               }
           }
         else if (role != Accessibility_ROLE_APPLICATION)
-#else
-        if (role != Accessibility_ROLE_APPLICATION)
-#endif
           spi_object_append_null_reference (&iter_struct);
         else
           spi_object_append_desktop_reference (&iter_struct);
@@ -152,7 +156,6 @@ append_cache_item (AtkObject * obj, gpointer data)
             g_object_unref (G_OBJECT (child));
           }
       }
-#ifdef SPI_ATK_PLUG_SOCKET
     if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj)))
       {
         AtkSocket *socket = ATK_SOCKET (obj);
@@ -171,7 +174,6 @@ append_cache_item (AtkObject * obj, gpointer data)
           }
         g_free (child_name);
       }
-#endif
 
     dbus_message_iter_close_container (&iter_struct, &iter_sub_array);
 

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 574dc09..fc05a1f 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -148,7 +148,6 @@ spi_atk_bridge_get_bus (void)
     }
   else
     {
-g_print("dbg: data=%s\n", data);
       bus = dbus_connection_open (data, &error);
       if (!bus)
         {
@@ -267,7 +266,6 @@ exit_func (void)
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef SPI_ATK_PLUG_SOCKET
 static AtkPlugClass *plug_class;
 static AtkSocketClass *socket_class;
 
@@ -324,7 +322,6 @@ install_plug_hooks ()
   plug_class->get_object_id = get_plug_id;
   socket_class->embed = socket_embed_hook;
 }
-#endif
 
 gchar *atspi_dbus_name = NULL;
 static gboolean atspi_no_register = FALSE;
@@ -456,10 +453,8 @@ adaptor_init (gint * argc, gchar ** argv[])
   /* Register methods to send D-Bus signals on certain ATK events */
   spi_atk_register_event_listeners ();
 
-#ifdef SPI_ATK_PLUG_SOCKET
   /* Hook our plug-and socket functions */
   install_plug_hooks ();
-#endif
 
   /* Register this app by sending a signal out to AT-SPI registry daemon */
   if (!atspi_no_register)

diff --git a/configure.ac b/configure.ac
index a963199..87d2a84 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ PKG_CHECK_MODULES(LIB_XML, [libxml-2.0 >= 2.0.0])
 AC_SUBST(LIB_XML_LIBS)
 AC_SUBST(LIB_XML_CFLAGS)
 
-PKG_CHECK_MODULES(ATK, [atk >= 1.17.0])
+PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)