interface atspi component: Adjusted to Eo2.

diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.c b/legacy/elementary/src/lib/elm_interface_atspi_component.c
index 6c1f351..165ecfb 100644 (file)
--- a/legacy/elementary/src/lib/elm_interface_atspi_component.c
+++ b/legacy/elementary/src/lib/elm_interface_atspi_component.c
@@ -2,13 +2,14 @@
 # include "elementary_config.h"
 #endif
 
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
+#include "atspi/atspi-constants.h"
+
 #include <Elementary.h>
 
 #include "elm_priv.h"
 #include "elm_interface_atspi_component.eo.h"
 
-#include "atspi/atspi-constants.h"
-
 EOLIAN static void
 _elm_interface_atspi_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED,int *x, int *y, AtspiCoordType type)
 {
@@ -22,7 +23,7 @@ _elm_interface_atspi_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_
    int c_w, c_h;
 
    eo_do(obj, elm_interface_atspi_component_extents_get(NULL, NULL, &c_w, &c_h, type));
-   eo_do(obj, elm_interface_atspi_component_extents_set(x, y, c_w, c_h, type, &ret));
+   eo_do(obj, ret = elm_interface_atspi_component_extents_set(x, y, c_w, c_h, type));
    return ret;
 }
 
@@ -30,10 +31,10 @@ EOLIAN static Eina_Bool
 _elm_interface_atspi_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int w, int h)
 {
    Eina_Bool ret = EINA_FALSE;
-   int c_x, c_y;
+   int c_x = 0, c_y = 0;
 
    eo_do(obj, elm_interface_atspi_component_extents_get(&c_x, &c_y, NULL, NULL, ATSPI_COORD_TYPE_WINDOW));
-   eo_do(obj, elm_interface_atspi_component_extents_set(c_x, c_y, w, h, ATSPI_COORD_TYPE_WINDOW, &ret));
+   eo_do(obj, ret = elm_interface_atspi_component_extents_set(c_x, c_y, w, h, ATSPI_COORD_TYPE_WINDOW));
    return ret;
 }
 
@@ -47,10 +48,9 @@ EOLIAN static Eina_Bool
 _elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED,
       int x, int y, AtspiCoordType type)
 {
-   int w_x, w_y, w_w, w_h;
+   int w_x = 0, w_y = 0, w_w = 0, w_h = 0;
 
-   if (!eo_do(obj, elm_interface_atspi_component_extents_get(&w_x, &w_y, &w_w, &w_h, type)))
-      return EINA_FALSE;
+   eo_do(obj, elm_interface_atspi_component_extents_get(&w_x, &w_y, &w_w, &w_h, type));
 
    if ((x >= w_x) && (x <= w_x + w_w) && (y >= w_y) && (y <= w_y + w_h))
      return EINA_TRUE;