From 51cc6513bf5d107b4a6e936c7ce7046ccc08928c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 8 Mar 2019 10:54:00 -0500 Subject: [PATCH] efl.access.selection: rename events to avoid conflicts Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8263 --- src/lib/elementary/efl_access_selection.eo | 2 +- src/lib/elementary/elm_atspi_bridge.c | 2 +- src/lib/elementary/elm_menu.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_access_selection.eo b/src/lib/elementary/efl_access_selection.eo index 4f199ff73a..3b2d703ed2 100644 --- a/src/lib/elementary/efl_access_selection.eo +++ b/src/lib/elementary/efl_access_selection.eo @@ -55,6 +55,6 @@ interface @beta Efl.Access.Selection } } events { - selection,changed: void; [[Called when selection has been changed.]] + access,selection,changed: void; [[Called when selection has been changed.]] } } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 53e79cc3fa..d9f271f3dd 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -164,7 +164,7 @@ static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = { { EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send}, - { EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send}, + { EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, _selection_signal_send}, { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send }, { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send }, { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send }, diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index aebcd7dd37..767d3d68f0 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data, if (eo_item2 != EO_OBJ(item)) elm_menu_item_selected_set(eo_item2, 0); } - efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, NULL); } else { @@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data, elm_menu_item_selected_set(eo_item2, 0); } } - efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, NULL); if (sd->menu_bar && was_open) _menu_item_select_cb(item, NULL, NULL, NULL); }