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.
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))
{
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);
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))
{
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);
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);
}
g_free (child_name);
}
-#endif
dbus_message_iter_close_container (&iter_struct, &iter_sub_array);
}
else
{
-g_print("dbg: data=%s\n", data);
bus = dbus_connection_open (data, &error);
if (!bus)
{
/*---------------------------------------------------------------------------*/
-#ifdef SPI_ATK_PLUG_SOCKET
static AtkPlugClass *plug_class;
static AtkSocketClass *socket_class;
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;
/* 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)
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)