From: Mike Gorse Date: Thu, 28 Jul 2011 17:09:20 +0000 (-0500) Subject: Fix breakage introduced in last commit X-Git-Tag: AT_SPI2_ATK_2_12_0~194 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=commitdiff_plain;h=9bf5438bc21faae6e628a82a5dbd90bb9cface82;hp=6fc02645f8c017457a051344353bedeb9dffb034 Fix breakage introduced in last commit --- diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include index 1bddbbd..bf3fb03 100644 --- a/atk-adaptor/Makefile.include +++ b/atk-adaptor/Makefile.include @@ -30,6 +30,8 @@ libatk_bridge_la_SOURCES = \ $(top_builddir)/atk-adaptor/accessible-cache.h \ $(top_builddir)/atk-adaptor/accessible-register.c \ $(top_builddir)/atk-adaptor/accessible-register.h \ + $(top_builddir)/atk-adaptor/accessible-stateset.c \ + $(top_builddir)/atk-adaptor/accessible-stateset.h \ $(top_builddir)/atk-adaptor/introspection.c \ $(top_builddir)/atk-adaptor/introspection.h \ $(top_builddir)/atk-adaptor/bridge.c \ diff --git a/atk-adaptor/accessible-stateset.c b/atk-adaptor/accessible-stateset.c index 2c148f0..dfb2e7d 100644 --- a/atk-adaptor/accessible-stateset.c +++ b/atk-adaptor/accessible-stateset.c @@ -25,11 +25,11 @@ #include #include -#include "spi-stateset.h" +#include "accessible-stateset.h" #include "bitarray.h" -static Accessibility_StateType *accessible_state_types = NULL; +static AtspiStateType *accessible_state_types = NULL; static AtkStateType *atk_state_types = NULL; @@ -41,113 +41,113 @@ spi_init_state_type_tables (void) if (accessible_state_types || atk_state_types) return FALSE; if (!accessible_state_types) - accessible_state_types = g_new (Accessibility_StateType, ATK_STATE_LAST_DEFINED); + accessible_state_types = g_new (AtspiStateType, ATK_STATE_LAST_DEFINED); if (!atk_state_types) - atk_state_types = g_new (AtkStateType, Accessibility_STATE_LAST_DEFINED); + atk_state_types = g_new (AtkStateType, ATSPI_STATE_LAST_DEFINED); g_return_val_if_fail (accessible_state_types, FALSE); g_return_val_if_fail (atk_state_types, FALSE); - for (i = 0; i < Accessibility_STATE_LAST_DEFINED; i++) + for (i = 0; i < ATSPI_STATE_LAST_DEFINED; i++) { atk_state_types[i] = ATK_STATE_INVALID; } for (i=0; i < ATK_STATE_LAST_DEFINED; i++) { - accessible_state_types[i] = Accessibility_STATE_INVALID; + accessible_state_types[i] = ATSPI_STATE_INVALID; } - accessible_state_types[ATK_STATE_ACTIVE] = Accessibility_STATE_ACTIVE; - atk_state_types[Accessibility_STATE_ACTIVE] = ATK_STATE_ACTIVE; - accessible_state_types[ATK_STATE_ARMED] = Accessibility_STATE_ARMED; - atk_state_types[Accessibility_STATE_ARMED] = ATK_STATE_ARMED; - accessible_state_types[ATK_STATE_BUSY] = Accessibility_STATE_BUSY; - atk_state_types[Accessibility_STATE_BUSY] = ATK_STATE_BUSY; - accessible_state_types[ATK_STATE_CHECKED] = Accessibility_STATE_CHECKED; - atk_state_types[Accessibility_STATE_CHECKED] = ATK_STATE_CHECKED; - accessible_state_types[ATK_STATE_DEFUNCT] = Accessibility_STATE_DEFUNCT; - atk_state_types[Accessibility_STATE_DEFUNCT] = ATK_STATE_DEFUNCT; - accessible_state_types[ATK_STATE_EDITABLE] = Accessibility_STATE_EDITABLE; - atk_state_types[Accessibility_STATE_EDITABLE] = ATK_STATE_EDITABLE; - accessible_state_types[ATK_STATE_ENABLED] = Accessibility_STATE_ENABLED; - atk_state_types[Accessibility_STATE_ENABLED] = ATK_STATE_ENABLED; - accessible_state_types[ATK_STATE_EXPANDABLE] = Accessibility_STATE_EXPANDABLE; - atk_state_types[Accessibility_STATE_EXPANDABLE] = ATK_STATE_EXPANDABLE; - accessible_state_types[ATK_STATE_EXPANDED] = Accessibility_STATE_EXPANDED; - atk_state_types[Accessibility_STATE_EXPANDED] = ATK_STATE_EXPANDED; - accessible_state_types[ATK_STATE_FOCUSABLE] = Accessibility_STATE_FOCUSABLE; - atk_state_types[Accessibility_STATE_FOCUSABLE] = ATK_STATE_FOCUSABLE; - accessible_state_types[ATK_STATE_FOCUSED] = Accessibility_STATE_FOCUSED; - atk_state_types[Accessibility_STATE_FOCUSED] = ATK_STATE_FOCUSED; - accessible_state_types[ATK_STATE_HORIZONTAL] = Accessibility_STATE_HORIZONTAL; - atk_state_types[Accessibility_STATE_HORIZONTAL] = ATK_STATE_HORIZONTAL; - accessible_state_types[ATK_STATE_ICONIFIED] = Accessibility_STATE_ICONIFIED; - atk_state_types[Accessibility_STATE_ICONIFIED] = ATK_STATE_ICONIFIED; - accessible_state_types[ATK_STATE_MODAL] = Accessibility_STATE_MODAL; - atk_state_types[Accessibility_STATE_MODAL] = ATK_STATE_MODAL; - accessible_state_types[ATK_STATE_MULTI_LINE] = Accessibility_STATE_MULTI_LINE; - atk_state_types[Accessibility_STATE_MULTI_LINE] = ATK_STATE_MULTI_LINE; - accessible_state_types[ATK_STATE_MULTISELECTABLE] = Accessibility_STATE_MULTISELECTABLE; - atk_state_types[Accessibility_STATE_MULTISELECTABLE] = ATK_STATE_MULTISELECTABLE; - accessible_state_types[ATK_STATE_OPAQUE] = Accessibility_STATE_OPAQUE; - atk_state_types[Accessibility_STATE_OPAQUE] = ATK_STATE_OPAQUE; - accessible_state_types[ATK_STATE_PRESSED] = Accessibility_STATE_PRESSED; - atk_state_types[Accessibility_STATE_PRESSED] = ATK_STATE_PRESSED; - accessible_state_types[ATK_STATE_RESIZABLE] = Accessibility_STATE_RESIZABLE; - atk_state_types[Accessibility_STATE_RESIZABLE] = ATK_STATE_RESIZABLE; - accessible_state_types[ATK_STATE_SELECTABLE] = Accessibility_STATE_SELECTABLE; - atk_state_types[Accessibility_STATE_SELECTABLE] = ATK_STATE_SELECTABLE; - accessible_state_types[ATK_STATE_SELECTED] = Accessibility_STATE_SELECTED; - atk_state_types[Accessibility_STATE_SELECTED] = ATK_STATE_SELECTED; - accessible_state_types[ATK_STATE_SENSITIVE] = Accessibility_STATE_SENSITIVE; - atk_state_types[Accessibility_STATE_SENSITIVE] = ATK_STATE_SENSITIVE; - accessible_state_types[ATK_STATE_SHOWING] = Accessibility_STATE_SHOWING; - atk_state_types[Accessibility_STATE_SHOWING] = ATK_STATE_SHOWING; - accessible_state_types[ATK_STATE_SINGLE_LINE] = Accessibility_STATE_SINGLE_LINE; - atk_state_types[Accessibility_STATE_SINGLE_LINE] = ATK_STATE_SINGLE_LINE; - accessible_state_types[ATK_STATE_STALE] = Accessibility_STATE_STALE; - atk_state_types[Accessibility_STATE_STALE] = ATK_STATE_STALE; - accessible_state_types[ATK_STATE_TRANSIENT] = Accessibility_STATE_TRANSIENT; - atk_state_types[Accessibility_STATE_TRANSIENT] = ATK_STATE_TRANSIENT; - accessible_state_types[ATK_STATE_VERTICAL] = Accessibility_STATE_VERTICAL; - atk_state_types[Accessibility_STATE_VERTICAL] = ATK_STATE_VERTICAL; - accessible_state_types[ATK_STATE_VISIBLE] = Accessibility_STATE_VISIBLE; - atk_state_types[Accessibility_STATE_VISIBLE] = ATK_STATE_VISIBLE; - accessible_state_types[ATK_STATE_MANAGES_DESCENDANTS] = Accessibility_STATE_MANAGES_DESCENDANTS; - atk_state_types[Accessibility_STATE_MANAGES_DESCENDANTS] = ATK_STATE_MANAGES_DESCENDANTS; - accessible_state_types[ATK_STATE_INDETERMINATE] = Accessibility_STATE_INDETERMINATE; - atk_state_types[Accessibility_STATE_INDETERMINATE] = ATK_STATE_INDETERMINATE; - accessible_state_types[ATK_STATE_TRUNCATED] = Accessibility_STATE_TRUNCATED; - atk_state_types[Accessibility_STATE_TRUNCATED] = ATK_STATE_TRUNCATED; - accessible_state_types[ATK_STATE_REQUIRED] = Accessibility_STATE_REQUIRED; - atk_state_types[Accessibility_STATE_REQUIRED] = ATK_STATE_REQUIRED; - accessible_state_types[ATK_STATE_INVALID_ENTRY] = Accessibility_STATE_INVALID_ENTRY; - atk_state_types[Accessibility_STATE_INVALID_ENTRY] = ATK_STATE_INVALID_ENTRY; - accessible_state_types[ATK_STATE_SUPPORTS_AUTOCOMPLETION] = Accessibility_STATE_SUPPORTS_AUTOCOMPLETION; - atk_state_types[Accessibility_STATE_SUPPORTS_AUTOCOMPLETION] = ATK_STATE_SUPPORTS_AUTOCOMPLETION; - accessible_state_types[ATK_STATE_SELECTABLE_TEXT] = Accessibility_STATE_SELECTABLE_TEXT; - atk_state_types[Accessibility_STATE_SELECTABLE_TEXT] = ATK_STATE_SELECTABLE_TEXT; - accessible_state_types[ATK_STATE_DEFAULT] = Accessibility_STATE_IS_DEFAULT; - atk_state_types[Accessibility_STATE_IS_DEFAULT] = ATK_STATE_DEFAULT; - accessible_state_types[ATK_STATE_VISITED] = Accessibility_STATE_VISITED; - atk_state_types[Accessibility_STATE_VISITED] = ATK_STATE_VISITED; + accessible_state_types[ATK_STATE_ACTIVE] = ATSPI_STATE_ACTIVE; + atk_state_types[ATSPI_STATE_ACTIVE] = ATK_STATE_ACTIVE; + accessible_state_types[ATK_STATE_ARMED] = ATSPI_STATE_ARMED; + atk_state_types[ATSPI_STATE_ARMED] = ATK_STATE_ARMED; + accessible_state_types[ATK_STATE_BUSY] = ATSPI_STATE_BUSY; + atk_state_types[ATSPI_STATE_BUSY] = ATK_STATE_BUSY; + accessible_state_types[ATK_STATE_CHECKED] = ATSPI_STATE_CHECKED; + atk_state_types[ATSPI_STATE_CHECKED] = ATK_STATE_CHECKED; + accessible_state_types[ATK_STATE_DEFUNCT] = ATSPI_STATE_DEFUNCT; + atk_state_types[ATSPI_STATE_DEFUNCT] = ATK_STATE_DEFUNCT; + accessible_state_types[ATK_STATE_EDITABLE] = ATSPI_STATE_EDITABLE; + atk_state_types[ATSPI_STATE_EDITABLE] = ATK_STATE_EDITABLE; + accessible_state_types[ATK_STATE_ENABLED] = ATSPI_STATE_ENABLED; + atk_state_types[ATSPI_STATE_ENABLED] = ATK_STATE_ENABLED; + accessible_state_types[ATK_STATE_EXPANDABLE] = ATSPI_STATE_EXPANDABLE; + atk_state_types[ATSPI_STATE_EXPANDABLE] = ATK_STATE_EXPANDABLE; + accessible_state_types[ATK_STATE_EXPANDED] = ATSPI_STATE_EXPANDED; + atk_state_types[ATSPI_STATE_EXPANDED] = ATK_STATE_EXPANDED; + accessible_state_types[ATK_STATE_FOCUSABLE] = ATSPI_STATE_FOCUSABLE; + atk_state_types[ATSPI_STATE_FOCUSABLE] = ATK_STATE_FOCUSABLE; + accessible_state_types[ATK_STATE_FOCUSED] = ATSPI_STATE_FOCUSED; + atk_state_types[ATSPI_STATE_FOCUSED] = ATK_STATE_FOCUSED; + accessible_state_types[ATK_STATE_HORIZONTAL] = ATSPI_STATE_HORIZONTAL; + atk_state_types[ATSPI_STATE_HORIZONTAL] = ATK_STATE_HORIZONTAL; + accessible_state_types[ATK_STATE_ICONIFIED] = ATSPI_STATE_ICONIFIED; + atk_state_types[ATSPI_STATE_ICONIFIED] = ATK_STATE_ICONIFIED; + accessible_state_types[ATK_STATE_MODAL] = ATSPI_STATE_MODAL; + atk_state_types[ATSPI_STATE_MODAL] = ATK_STATE_MODAL; + accessible_state_types[ATK_STATE_MULTI_LINE] = ATSPI_STATE_MULTI_LINE; + atk_state_types[ATSPI_STATE_MULTI_LINE] = ATK_STATE_MULTI_LINE; + accessible_state_types[ATK_STATE_MULTISELECTABLE] = ATSPI_STATE_MULTISELECTABLE; + atk_state_types[ATSPI_STATE_MULTISELECTABLE] = ATK_STATE_MULTISELECTABLE; + accessible_state_types[ATK_STATE_OPAQUE] = ATSPI_STATE_OPAQUE; + atk_state_types[ATSPI_STATE_OPAQUE] = ATK_STATE_OPAQUE; + accessible_state_types[ATK_STATE_PRESSED] = ATSPI_STATE_PRESSED; + atk_state_types[ATSPI_STATE_PRESSED] = ATK_STATE_PRESSED; + accessible_state_types[ATK_STATE_RESIZABLE] = ATSPI_STATE_RESIZABLE; + atk_state_types[ATSPI_STATE_RESIZABLE] = ATK_STATE_RESIZABLE; + accessible_state_types[ATK_STATE_SELECTABLE] = ATSPI_STATE_SELECTABLE; + atk_state_types[ATSPI_STATE_SELECTABLE] = ATK_STATE_SELECTABLE; + accessible_state_types[ATK_STATE_SELECTED] = ATSPI_STATE_SELECTED; + atk_state_types[ATSPI_STATE_SELECTED] = ATK_STATE_SELECTED; + accessible_state_types[ATK_STATE_SENSITIVE] = ATSPI_STATE_SENSITIVE; + atk_state_types[ATSPI_STATE_SENSITIVE] = ATK_STATE_SENSITIVE; + accessible_state_types[ATK_STATE_SHOWING] = ATSPI_STATE_SHOWING; + atk_state_types[ATSPI_STATE_SHOWING] = ATK_STATE_SHOWING; + accessible_state_types[ATK_STATE_SINGLE_LINE] = ATSPI_STATE_SINGLE_LINE; + atk_state_types[ATSPI_STATE_SINGLE_LINE] = ATK_STATE_SINGLE_LINE; + accessible_state_types[ATK_STATE_STALE] = ATSPI_STATE_STALE; + atk_state_types[ATSPI_STATE_STALE] = ATK_STATE_STALE; + accessible_state_types[ATK_STATE_TRANSIENT] = ATSPI_STATE_TRANSIENT; + atk_state_types[ATSPI_STATE_TRANSIENT] = ATK_STATE_TRANSIENT; + accessible_state_types[ATK_STATE_VERTICAL] = ATSPI_STATE_VERTICAL; + atk_state_types[ATSPI_STATE_VERTICAL] = ATK_STATE_VERTICAL; + accessible_state_types[ATK_STATE_VISIBLE] = ATSPI_STATE_VISIBLE; + atk_state_types[ATSPI_STATE_VISIBLE] = ATK_STATE_VISIBLE; + accessible_state_types[ATK_STATE_MANAGES_DESCENDANTS] = ATSPI_STATE_MANAGES_DESCENDANTS; + atk_state_types[ATSPI_STATE_MANAGES_DESCENDANTS] = ATK_STATE_MANAGES_DESCENDANTS; + accessible_state_types[ATK_STATE_INDETERMINATE] = ATSPI_STATE_INDETERMINATE; + atk_state_types[ATSPI_STATE_INDETERMINATE] = ATK_STATE_INDETERMINATE; + accessible_state_types[ATK_STATE_TRUNCATED] = ATSPI_STATE_TRUNCATED; + atk_state_types[ATSPI_STATE_TRUNCATED] = ATK_STATE_TRUNCATED; + accessible_state_types[ATK_STATE_REQUIRED] = ATSPI_STATE_REQUIRED; + atk_state_types[ATSPI_STATE_REQUIRED] = ATK_STATE_REQUIRED; + accessible_state_types[ATK_STATE_INVALID_ENTRY] = ATSPI_STATE_INVALID_ENTRY; + atk_state_types[ATSPI_STATE_INVALID_ENTRY] = ATK_STATE_INVALID_ENTRY; + accessible_state_types[ATK_STATE_SUPPORTS_AUTOCOMPLETION] = ATSPI_STATE_SUPPORTS_AUTOCOMPLETION; + atk_state_types[ATSPI_STATE_SUPPORTS_AUTOCOMPLETION] = ATK_STATE_SUPPORTS_AUTOCOMPLETION; + accessible_state_types[ATK_STATE_SELECTABLE_TEXT] = ATSPI_STATE_SELECTABLE_TEXT; + atk_state_types[ATSPI_STATE_SELECTABLE_TEXT] = ATK_STATE_SELECTABLE_TEXT; + accessible_state_types[ATK_STATE_DEFAULT] = ATSPI_STATE_IS_DEFAULT; + atk_state_types[ATSPI_STATE_IS_DEFAULT] = ATK_STATE_DEFAULT; + accessible_state_types[ATK_STATE_VISITED] = ATSPI_STATE_VISITED; + atk_state_types[ATSPI_STATE_VISITED] = ATK_STATE_VISITED; return TRUE; } static inline AtkState -state_spi_to_atk (Accessibility_StateType state) +state_spi_to_atk (AtspiStateType state) { guint idx = state; - if (idx < Accessibility_STATE_LAST_DEFINED) + if (idx < ATSPI_STATE_LAST_DEFINED) return atk_state_types [idx]; else return ATK_STATE_INVALID; } AtkState -spi_atk_state_from_spi_state (Accessibility_StateType state) +spi_atk_state_from_spi_state (AtspiStateType state) { spi_init_state_type_tables (); return state_spi_to_atk (state);