fix: x11 get priority over wayland when both available

(Could be squashed in 047b951d1963950298d6dd21a92fc8a870d784f3)

Change-Id: Ic49e6d952bf16ca96985ab3c3d078c93ffd049a5
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/src/lib/efl_assist_screen_reader.c b/src/lib/efl_assist_screen_reader.c
index d5740e5..76f8fc8 100644 (file)
--- a/src/lib/efl_assist_screen_reader.c
+++ b/src/lib/efl_assist_screen_reader.c
@@ -121,18 +121,18 @@ static void _tts_init(void)
 
 static void _timeout_cb(void *data, Evas_Object *obj, void *event_info)
 {
-#ifdef HAVE_WAYLAND
-    Ecore_Wl_Window *w;
-#elif HAVE_X
-    Ecore_X_Window w;
+#ifdef HAVE_X
+   Ecore_X_Window w;
+#elif defined HAVE_WAYLAND
+   Ecore_Wl_Window *w;
 #endif
 
    unsigned int val;
 
-#ifdef HAVE_WAYLAND
-   w = elm_win_wl_window_get(data);
-#elif HAVE_X
+#ifdef HAVE_X
    w = elm_win_xwindow_get(data);
+#elif defined HAVE_WAYLAND
+   w = elm_win_wl_window_get(data);
 #endif
    if (!w) return;
 
@@ -153,10 +153,10 @@ static void _timeout_cb(void *data, Evas_Object *obj, void *event_info)
 EAPI Eina_Bool
 ea_screen_reader_support_set(Evas_Object *win, Eina_Bool support)
 {
-#ifdef HAVE_WAYLAND
-   Ecore_Wl_Window *w;
-#elif HAVE_X
+#ifdef HAVE_X
    Ecore_X_Window w;
+#elif defined HAVE_WAYLAND
+   Ecore_Wl_Window *w;
 #endif
    unsigned int val;
    int tts_val;