From 6a36042d828c8edc3976eec6deb9a4e7a7a7b037 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 21 Mar 2022 10:37:38 -0500 Subject: Lower atk required version again Only initialize support for ATK_STATE_COLLAPSED if atk and at-spi2-core are new enough to support them, and lower the atk requirement in meson.build. Atk needs a release, so otherwise we depend on unreleased git code. --- atk-adaptor/accessible-stateset.c | 2 ++ meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/atk-adaptor/accessible-stateset.c b/atk-adaptor/accessible-stateset.c index 3085220..7a05fa2 100644 --- a/atk-adaptor/accessible-stateset.c +++ b/atk-adaptor/accessible-stateset.c @@ -141,8 +141,10 @@ spi_init_state_type_tables (void) atk_state_types[ATSPI_STATE_HAS_TOOLTIP] = ATK_STATE_HAS_TOOLTIP; accessible_state_types[ATK_STATE_READ_ONLY] = ATSPI_STATE_READ_ONLY; atk_state_types[ATSPI_STATE_READ_ONLY] = ATK_STATE_READ_ONLY; +#if defined(ATK_STATE_COLLAPSED) && defined(ATSPI_STATE_COLLAPSED) accessible_state_types[ATK_STATE_COLLAPSED] = ATSPI_STATE_COLLAPSED; atk_state_types[ATSPI_STATE_COLLAPSED] = ATK_STATE_COLLAPSED; +#endif return TRUE; } diff --git a/meson.build b/meson.build index 5edcb9a..33692aa 100644 --- a/meson.build +++ b/meson.build @@ -38,7 +38,7 @@ libdbus_req_version = '>= 1.5' glib_req_version = '>= 2.32.0' gobject_req_version = '>= 2.0.0' gmodule_req_version = '>= 2.0.0' -atk_req_version = '>= 2.37.0' +atk_req_version = '>= 2.36.0' atspi_req_version = '>= 2.33.2' libxml_req_version = '>= 2.9.1' -- cgit v1.2.1