summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 10:53:56 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 13:21:25 +0100
commit2b264c606a8375c5e01db4f57721ac786804f8c6 (patch)
tree8f2998348b4fa1431198c94b67fb1e5b81078169
parentd54d4fb9c8815432101606cf66ce9e29c2c3a903 (diff)
ecore evas, edje - fix use of evas seat device enum
-rw-r--r--src/lib/edje/edje_entry.c2
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c4
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)
4702 Evas *e; 4702 Evas *e;
4703 4703
4704 e = evas_object_evas_get(ed->obj); 4704 e = evas_object_evas_get(ed->obj);
4705 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 4705 seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT);
4706 seat_name = _edje_seat_name_get(ed, seat); 4706 seat_name = _edje_seat_name_get(ed, seat);
4707 4707
4708 return _edje_focused_part_get(ed, seat_name); 4708 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)
629 else /* Use default seat name */ 629 else /* Use default seat name */
630 { 630 {
631 e = evas_object_evas_get(ed->obj); 631 e = evas_object_evas_get(ed->obj);
632 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 632 seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT);
633 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat)); 633 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat));
634 } 634 }
635 635
@@ -1017,7 +1017,7 @@ low_mem_current:
1017 Evas *e; 1017 Evas *e;
1018 1018
1019 e = evas_object_evas_get(ed->obj); 1019 e = evas_object_evas_get(ed->obj);
1020 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 1020 seat = evas_default_device_get(e, EVAS_DEVICE_CLASS_SEAT);
1021 } 1021 }
1022 if (!pr->targets) 1022 if (!pr->targets)
1023 { 1023 {
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
753 Extn *extn; 753 Extn *extn;
754 Evas_Device *dev; 754 Evas_Device *dev;
755 755
756 dev = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT); 756 dev = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_SEAT);
757 if (ecore_evas_focus_device_get(ee, dev)) return; 757 if (ecore_evas_focus_device_get(ee, dev)) return;
758 ee->prop.focused_by = eina_list_append(ee->prop.focused_by, dev); 758 ee->prop.focused_by = eina_list_append(ee->prop.focused_by, dev);
759 extn = bdata->data; 759 extn = bdata->data;
@@ -770,7 +770,7 @@ _ecore_evas_extn_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
770 Extn *extn; 770 Extn *extn;
771 771
772 ee->prop.focused_by = eina_list_remove(ee->prop.focused_by, 772 ee->prop.focused_by = eina_list_remove(ee->prop.focused_by,
773 evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)); 773 evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_SEAT));
774 extn = bdata->data; 774 extn = bdata->data;
775 if (!extn) return; 775 if (!extn) return;
776 if (!extn->ipc.server) return; 776 if (!extn->ipc.server) return;