raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2b264c606a8375c5e01db4f57721ac786804f8c6
commit 2b264c606a8375c5e01db4f57721ac786804f8c6 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Tue Aug 25 10:53:56 2020 +0100 ecore evas, edje - fix use of evas seat device enum --- src/lib/edje/edje_entry.c | 2 +- src/lib/edje/edje_program.c | 4 ++-- src/modules/ecore_evas/engines/extn/ecore_evas_extn.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 442a5c6d38..ab48c3dd3a 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -4702,7 +4702,7 @@ _edje_entry_imf_default_focused_rp_get(Edje *ed) Evas *e; e = evas_object_evas_get(ed->obj); - seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); + seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT); seat_name = _edje_seat_name_get(ed, seat); return _edje_focused_part_get(ed, seat_name); diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index 875bd1d3fd..2ee0c22204 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -629,7 +629,7 @@ _edje_part_focus_set(Edje *ed, const char *seat_name, Edje_Real_Part *rp) else /* Use default seat name */ { e = evas_object_evas_get(ed->obj); - seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); + seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT); sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat)); } @@ -1017,7 +1017,7 @@ low_mem_current: Evas *e; e = evas_object_evas_get(ed->obj); - seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); + seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT); } if (!pr->targets) { diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c index e7d3e298a9..37963fe664 100644 --- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c +++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c @@ -753,7 +753,7 @@ _ecore_evas_extn_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E Extn *extn; Evas_Device *dev; - dev = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT); + dev = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_SEAT); if (ecore_evas_focus_device_get(ee, dev)) return; ee->prop.focused_by = eina_list_append(ee->prop.focused_by, dev); extn = bdata->data; @@ -770,7 +770,7 @@ _ecore_evas_extn_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj Extn *extn; ee->prop.focused_by = eina_list_remove(ee->prop.focused_by, - evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)); + evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_SEAT)); extn = bdata->data; if (!extn) return; if (!extn->ipc.server) return; --