temporarily fix for enlightenment blocking issue 12/61012/1
authorBoram Park <boram1288.park@samsung.com>
Thu, 3 Mar 2016 08:46:22 +0000 (17:46 +0900)
committerBoram Park <boram1288.park@samsung.com>
Thu, 3 Mar 2016 08:46:22 +0000 (17:46 +0900)
Change-Id: I5d16778ff93a181f07d261acdab8b042f2ea6914

src/lib/ecore_con/ecore_con_local.c
src/lib/ecore_wayland/Ecore_Wayland.h
src/lib/ecore_wayland/ecore_wl.c

index c9496e2..e514d44 100644 (file)
@@ -98,6 +98,9 @@ _ecore_con_local_get_socket_from_server()
    struct tizen_embedded_compositor *tec = NULL;
    int fd = -1;
 
+   if (ecore_wl_server_mode_get())
+     return -1;
+
    l = ecore_wl_globals_get();
    if (!l)
      {
index 5a4164b..a678716 100644 (file)
@@ -1002,6 +1002,8 @@ EAPI struct wl_array *ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input);
  */
 EAPI void ecore_wl_server_mode_set(Eina_Bool on);
 
+EAPI Eina_Bool ecore_wl_server_mode_get(void);
+
 /**
  * @defgroup Ecore_Wl_Subsurf Functions to manipulate subsurfaces.
  * @ingroup Ecore_Wl_Group
index e5d535f..b8296fa 100644 (file)
@@ -555,6 +555,12 @@ ecore_wl_server_mode_set(Eina_Bool on)
    _ecore_wl_server_mode = on;
 }
 
+EAPI Eina_Bool
+ecore_wl_server_mode_get(void)
+{
+   return _ecore_wl_server_mode;
+}
+
 /* local functions */
 static int
 _ecore_wl_shutdown(Eina_Bool close)