elm: Fix use of Efl.Access APIs

See also 7d397c9f195a9121153909c0f

Thanks @stefan for the first fix patch, I simply failed to push this one
early enough.

diff --git a/src/bindings/js/efl_js/efl_js.cc b/src/bindings/js/efl_js/efl_js.cc
index 8a5e7ba..c4f1f0b 100644 (file)
--- a/src/bindings/js/efl_js/efl_js.cc
+++ b/src/bindings/js/efl_js/efl_js.cc
@@ -153,7 +153,7 @@ EAPI void register_object(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_accessible(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
-EAPI void register_elm_interface_atspi_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
+EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_editable_text(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_image(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_selection(v8::Handle<v8::Object> global, v8::Isolate* isolate);
@@ -387,7 +387,7 @@ EAPI void init(v8::Handle<v8::Object> exports)
 
       // ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent());
       // ::register_elm_interface_atspi_action(exports, v8::Isolate::GetCurrent());
-      // ::register_elm_interface_atspi_component(exports, v8::Isolate::GetCurrent());
+      // ::register_efl_access_component(exports, v8::Isolate::GetCurrent());
       // ::register_elm_interface_atspi_editable_text(exports, v8::Isolate::GetCurrent());
       // ::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent());
       // ::register_elm_interface_atspi_selection(exports, v8::Isolate::GetCurrent());

diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc
index 5260eeb..7d7343c 100644 (file)
--- a/src/lib/elementary/elementary_js.cc
+++ b/src/lib/elementary/elementary_js.cc
@@ -37,7 +37,7 @@
 EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_accessible(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
-EAPI void register_elm_interface_atspi_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
+EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_text_editable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_image(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_selection(v8::Handle<v8::Object> global, v8::Isolate* isolate);
@@ -202,7 +202,7 @@ void init(v8::Handle<v8::Object> exports)
       elm::register_index(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_action(exports, v8::Isolate::GetCurrent());
-      ::register_elm_interface_atspi_component(exports, v8::Isolate::GetCurrent());
+      ::register_efl_access_component(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_selection(exports, v8::Isolate::GetCurrent());

diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index b52d253..16c7259 100644 (file)
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -3,7 +3,7 @@
 #endif
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
+#define EFL_ACCESS_COMPONENT_PROTECTED
 #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"