build: use legacy api in places where legacy should be used

these seem to randomly have been changed when they shouldn't have

also install elm_clock_eo.h since this is required but we didn't install it

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D9971

diff --git a/src/bin/elementary/test_datetime.c b/src/bin/elementary/test_datetime.c
index 719275b..1b4bd23 100644 (file)
--- a/src/bin/elementary/test_datetime.c
+++ b/src/bin/elementary/test_datetime.c
@@ -31,7 +31,7 @@ _bt_clicked(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUS
    new_time.tm_sec = 0;
    elm_datetime_field_visible_set(dt1, ELM_DATETIME_HOUR, EINA_TRUE);
    elm_datetime_field_visible_set(dt1, ELM_DATETIME_MINUTE, EINA_TRUE);
-   efl_ui_clock_pause_set(dt1, EINA_TRUE);
+   elm_clock_pause_set(dt1, EINA_TRUE);
    elm_datetime_value_set(dt1, &new_time);
    elm_object_disabled_set(dt1, EINA_TRUE);
    elm_object_disabled_set(obj, EINA_TRUE);

diff --git a/src/lib/elementary/elm_datetime.h b/src/lib/elementary/elm_datetime.h
index cc47da2..7385592 100644 (file)
--- a/src/lib/elementary/elm_datetime.h
+++ b/src/lib/elementary/elm_datetime.h
@@ -204,6 +204,7 @@
 
 #ifndef _ELM_DATE_TIME_H
 #define _ELM_DATE_TIME_H
+#include <elm_clock_eo.h>
 typedef enum
 {
    ELM_DATETIME_YEAR = 0, /**< Indicates Year field. */
@@ -462,7 +463,7 @@ EAPI Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, const Efl_Time *maxt
  */
 EAPI Eina_Bool elm_datetime_value_max_get(const Evas_Object *obj, Efl_Time *maxtime);
 
-#define ELM_DATETIME_EVENT_CHANGED EFL_UI_CLOCK_EVENT_CHANGED
+#define ELM_DATETIME_EVENT_CHANGED ELM_CLOCK_EVENT_CHANGED
 
 #endif
 /**

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 0094fbf..3e970cb 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -460,6 +460,7 @@ elementary_pub_headers = [
   'efl_ui_check_eo.h',
   'elm_check_legacy.h',
   'elm_clock.h',
+  'elm_clock_eo.h',
   'elm_clock_legacy.h',
   'elm_cnp.h',
   'elm_colorselector.h',

diff --git a/src/tests/elementary/elm_test_widget_focus.c b/src/tests/elementary/elm_test_widget_focus.c
index 46814d0..d41889b 100644 (file)
--- a/src/tests/elementary/elm_test_widget_focus.c
+++ b/src/tests/elementary/elm_test_widget_focus.c
@@ -93,7 +93,7 @@ static Evas_Object*
 _custom_progressbar(Evas_Object *win)
 {
    Evas_Object *o = elm_progressbar_add(win);
-   efl_ui_widget_focus_allow_set(o, EINA_TRUE);
+   elm_object_focus_allow_set(o, EINA_TRUE);
    return o;
 }