devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=33d0c8cdcfedd271b68008adc2a883139b5bb8bd
commit 33d0c8cdcfedd271b68008adc2a883139b5bb8bd Author: Chris Michael <cp.mich...@samsung.com> Date: Mon Dec 7 11:30:53 2015 -0500 ecore-wl2: Fix formatting and remove extra blank line NB: no functional changes Signed-off-by: Chris Michael <cp.mich...@samsung.com> --- src/lib/ecore_wl2/ecore_wl2_window.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index e4cbf6e..0556b8a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -221,7 +221,8 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if ((window->display->wl.xdg_shell) && (!window->xdg_surface)) { window->xdg_surface = - xdg_shell_get_xdg_surface(window->display->wl.xdg_shell, window->surface); + xdg_shell_get_xdg_surface(window->display->wl.xdg_shell, + window->surface); if (!window->xdg_surface) goto surf_err; if (window->title) @@ -229,7 +230,6 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if (window->class) xdg_surface_set_app_id(window->xdg_surface, window->class); - xdg_surface_set_user_data(window->xdg_surface, window); xdg_surface_add_listener(window->xdg_surface, &_xdg_surface_listener, window); @@ -240,7 +240,8 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) else if ((window->display->wl.wl_shell) && (!window->wl_shell_surface)) { window->wl_shell_surface = - wl_shell_get_shell_surface(window->display->wl.wl_shell, window->surface); + wl_shell_get_shell_surface(window->display->wl.wl_shell, + window->surface); if (!window->wl_shell_surface) goto surf_err; if (window->title) @@ -252,7 +253,9 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) &_wl_shell_surface_listener, window); _ecore_wl2_window_type_set(window); } + return; + surf_err: ERR("Failed to create surface for window: %m"); } --