[Tizen-submit] 22436: Changes to Tizen:Generic/efl-assist

noreply at tizen.org noreply at tizen.org
Tue Mar 11 10:30:38 GMT 2014


Hi,
Manuel Bachmann have made the following changes to efl-assist in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #22436

  submit:       Tizen:Generic:build/efl-assist(cleanup) -> Tizen:Generic


Message:
Submitter: Manuel Bachmann <manuel.bachmann at open.eurogiciel.org>
Comments: dynamically test x11 and wl at runtime
Git project: platform/core/uifw/efl-assist
Tag: submit/tizen/20140311.103042
Commit: 2659fedd5554aa32ddc72c3ff4c7a11c759cfd36 dynamically test x11 and wl at runtime

State:   new        2014-03-11T10:30:14 tizenrobot
Comment: <no comment>
spec files:
-----------
--- efl-assist.spec
+++ efl-assist.spec
@@ -2,7 +2,7 @@
 %bcond_with wayland
 
 Name:       efl-assist
-VCS:        platform/core/uifw/efl-assist#7a128ea063137fabe7ab3b199b8945627a01f51c
+VCS:        platform/core/uifw/efl-assist#2659fedd5554aa32ddc72c3ff4c7a11c759cfd36
 Summary:    EFL assist library
 Version:    0.1.18r02
 Release:    0

other changes:
--------------

++++++ efl-assist-0.1.18r02.tar.gz
--- src/lib/efl_assist_screen_reader.c
+++ src/lib/efl_assist_screen_reader.c
@@ -3,7 +3,7 @@
 
 #include <Ecore.h>
 
-#ifdef HAVE_X
+#ifdef HAVE_X11
 #include <Ecore_X.h>
 #endif
 #ifdef HAVE_WAYLAND
@@ -121,42 +121,44 @@
 
 static void _timeout_cb(void *data, Evas_Object *obj, void *event_info)
 {
-#ifdef HAVE_X
-   Ecore_X_Window w;
-#elif defined HAVE_WAYLAND
-   Ecore_Wl_Window *w;
+#ifdef HAVE_X11
+   Ecore_X_Window xwin=0;
+#endif
+#ifdef HAVE_WAYLAND
+   Ecore_Wl_Window *wwin=0;
 #endif
-
    unsigned int val;
 
-#ifdef HAVE_X
-   w = elm_win_xwindow_get(data);
-#elif defined HAVE_WAYLAND
-   w = elm_win_wl_window_get(data);
+#ifdef HAVE_X11
+   xwin = elm_win_xwindow_get(data);
+   if (xwin>0) {
+     evas_object_del(obj); obj=0;
+     val = 2;
+     ecore_x_window_prop_card32_set
+       (xwin, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, &val, 1);
+   } else
 #endif
-   if (!w) return;
-
-   evas_object_del(obj);
+     {
+#ifdef HAVE_WAYLAND
+     wwin = elm_win_wl_window_get(data);
+     if (wwin != NULL) {
+       evas_object_del(obj); obj=0;
 
-#ifdef HAVE_X
-   val = 2;
-   ecore_x_window_prop_card32_set
-     (win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, &val, 1);
-#else
-   fprintf(stderr, "TODO: workaround: disabled code from "
-	   __FILE__ ":%d:", __LINE__);
+       fprintf(stderr, "TODO: workaround: disabled code from "
+	       __FILE__ ":%d:", __LINE__);
+     }
 #endif
+   }
    _tts_shutdown();
-
 }
 
 EAPI Eina_Bool
 ea_screen_reader_support_set(Evas_Object *win, Eina_Bool support)

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list