devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b0fd93a564440c04c94a2fab076069af2d4afd25
commit b0fd93a564440c04c94a2fab076069af2d4afd25 Author: Chris Michael <[email protected]> Date: Wed Aug 13 10:34:49 2014 -0400 Revert "ecore-wayland: Fix formatting" This reverts commit e14f40a46d5009ff3a6771a20d1b6fac66470cd5. --- src/lib/ecore_wayland/ecore_wl_window.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 64df3f7..3fb5f87 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -16,6 +16,7 @@ static char *_ecore_wl_window_id_str_get(unsigned int win_id); static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial); static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial); + /* local variables */ static Eina_Hash *_windows = NULL; @@ -33,13 +34,11 @@ static const struct wl_shell_surface_listener _ecore_wl_shell_surface_listener = _ecore_wl_window_cb_popup_done }; -static const struct xdg_surface_listener _ecore_xdg_surface_listener = -{ +static const struct xdg_surface_listener _ecore_xdg_surface_listener = { _ecore_xdg_handle_surface_configure, }; -static const struct xdg_popup_listener _ecore_xdg_popup_listener = -{ +static const struct xdg_popup_listener _ecore_xdg_popup_listener = { _ecore_xdg_handle_popup_done, }; @@ -795,7 +794,9 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface if ((w <= 0) || (h <= 0)) return; if ((win->allocation.w != w) || (win->allocation.h != h)) - _ecore_wl_window_configure_send(win, w, h, edges); + { + _ecore_wl_window_configure_send(win, w, h, edges); + } } static void @@ -833,7 +834,9 @@ _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, } } if ((width > 0) && (height > 0)) - _ecore_wl_window_configure_send(win, width, height, 0); + { + _ecore_wl_window_configure_send(win, width, height, 0); + } else { if ((win->saved.w != 1) || (win->saved.h != 1)) --
