summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:54:00 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:17:59 -0800
commit51cc6513bf5d107b4a6e936c7ce7046ccc08928c (patch)
treee26bad6f2826fae63476f4ebfac122379470d346
parent51ef57d47fae838da940485836d52100b0b0fb9e (diff)
efl.access.selection: rename events to avoid conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8263
-rw-r--r--src/lib/elementary/efl_access_selection.eo2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c2
-rw-r--r--src/lib/elementary/elm_menu.c4
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
55 } 55 }
56 } 56 }
57 events { 57 events {
58 selection,changed: void; [[Called when selection has been changed.]] 58 access,selection,changed: void; [[Called when selection has been changed.]]
59 } 59 }
60} 60}
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[] = {
164 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send}, 164 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send},
165 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send}, 165 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
166 { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send}, 166 { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
167 { EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send}, 167 { EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, _selection_signal_send},
168 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send }, 168 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
169 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send }, 169 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
170 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send }, 170 { 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,
498 if (eo_item2 != EO_OBJ(item)) 498 if (eo_item2 != EO_OBJ(item))
499 elm_menu_item_selected_set(eo_item2, 0); 499 elm_menu_item_selected_set(eo_item2, 0);
500 } 500 }
501 efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 501 efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, NULL);
502 } 502 }
503 else 503 else
504 { 504 {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
513 elm_menu_item_selected_set(eo_item2, 0); 513 elm_menu_item_selected_set(eo_item2, 0);
514 } 514 }
515 } 515 }
516 efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 516 efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_ACCESS_SELECTION_CHANGED, NULL);
517 if (sd->menu_bar && was_open) 517 if (sd->menu_bar && was_open)
518 _menu_item_select_cb(item, NULL, NULL, NULL); 518 _menu_item_select_cb(item, NULL, NULL, NULL);
519 } 519 }