ecore-wl2: Fix calling wl_surface_frame with proper Ecore_Wl2 window frame

Signed-off-by: Chris Michael <cp.michael@samsung.com>
2015-10-19 10:42:09 -04:00 · 2015-10-19 10:42:09 -04:00 · 123ac16eb7
parent adf555660c
commit 123ac16eb7
1 changed files with 1 additions and 0 deletions
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@ -161,6 +161,7 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED,
   return ECORE_CALLBACK_PASS_ON;
 }

+<<<<<<< HEAD
 <<<<<<< cdc9ff78e4db118ef9e2d70b7425ca9b46bdb2df
 static Eina_Bool
 _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)