wip

This reverts commit b554b25c4c.

.ci/ci-make.sh

@@ -22,6 +22,8 @@ if [ "$DISTRO" != "" ] ; then
     docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
   fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+  latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"
+  export PATH="${latest_brew_python3_bin}${PATH:+:}${PATH}"
   export PATH="$(brew --prefix gettext)/bin:$PATH"
   ninja -C build
 else

.travis.yml

@@ -34,7 +34,7 @@ addons:
       - pulseaudio
       - ccache
       - ninja
-      - python3
+      - python
       - libffi
     update: true
 
@@ -46,6 +46,7 @@ env:
 
 jobs:
   include:
+    - os: osx
     - os: linux
       env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
     - os: linux

src/lib/elementary/elm_label_eo.c

@@ -216,6 +216,6 @@ static const Efl_Class_Description _elm_label_class_desc = {
    NULL
 };
 
-EFL_DEFINE_CLASS(elm_label_class_get, &_elm_label_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_label_class_get, &_elm_label_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, NULL);
 
 #include "elm_label_eo.legacy.c"

src/lib/evas/canvas/evas_object_intercept.c

@@ -9,25 +9,20 @@
 
 /* local calls */
 
-static void evas_object_intercept_init(Evas_Object *eo_obj);
-static void evas_object_intercept_deinit(Evas_Object *eo_obj);
+static void evas_object_intercept_init(Evas_Object_Protected_Data *obj);
+static void evas_object_intercept_deinit(Evas_Object_Protected_Data *obj);
 
 static void
-evas_object_intercept_init(Evas_Object *eo_obj)
+evas_object_intercept_init(Evas_Object_Protected_Data *obj)
 {
-   Evas_Object_Protected_Data *obj;
-
-   obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj) return;
-
    if (!obj->interceptors)
      obj->interceptors = calloc(1, sizeof(Evas_Intercept_Func));
 }
 
 static void
-evas_object_intercept_deinit(Evas_Object *eo_obj)
+evas_object_intercept_deinit(Evas_Object_Protected_Data *obj)
 {
-   Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    if (!obj || !obj->interceptors) return;
    if ((obj->interceptors->show.func) ||
        (obj->interceptors->hide.func) ||
@@ -270,7 +265,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj,
      MAGIC_CHECK_END();                                                 \
      Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
      if (!func) return;                                                 \
-     evas_object_intercept_init(eo_obj);                                \
+     evas_object_intercept_init(obj);                                   \
      if (!obj->interceptors) return;                                    \
      obj->interceptors->Lower_Type.func = func;                         \
      obj->interceptors->Lower_Type.data = (void *)data;                 \
@@ -291,7 +286,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj,
      obj->interceptors->Lower_Type.func = NULL;                         \
      data = obj->interceptors->Lower_Type.data;                         \
      obj->interceptors->Lower_Type.data = NULL;                         \
-     evas_object_intercept_deinit(eo_obj);                              \
+     evas_object_intercept_deinit(obj);                                 \
      return data;                                                       \
   }