devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f041344f9d1e01a7d02eec251008720d48f4ce45
commit f041344f9d1e01a7d02eec251008720d48f4ce45 Author: Chris Michael <[email protected]> Date: Wed Aug 13 10:34:57 2014 -0400 Revert "ecore-wayland: Fix formatting" This reverts commit ff299727038070a34538c208b2031c6d16c18e1f. --- src/lib/ecore_wayland/ecore_wl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index 10e4295..c4f87b0 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -64,8 +64,7 @@ static const struct wl_callback_listener _ecore_wl_anim_listener = _ecore_wl_animator_callback }; -static void -xdg_shell_ping(void *data, struct xdg_shell *shell, uint32_t serial) +static void xdg_shell_ping(void *data, struct xdg_shell *shell, uint32_t serial) { xdg_shell_pong(shell, serial); } @@ -75,6 +74,7 @@ static const struct xdg_shell_listener xdg_shell_listener = xdg_shell_ping, }; + /* external variables */ int _ecore_wl_log_dom = -1; Ecore_Wl_Display *_ecore_wl_disp = NULL; @@ -197,8 +197,7 @@ ecore_wl_init(const char *name) _ecore_wl_disp->fd = wl_display_get_fd(_ecore_wl_disp->wl.display); _ecore_wl_disp->fd_hdl = - ecore_main_fd_handler_add(_ecore_wl_disp->fd, - ECORE_FD_READ | ECORE_FD_WRITE | ECORE_FD_ERROR, + ecore_main_fd_handler_add(_ecore_wl_disp->fd, ECORE_FD_READ | ECORE_FD_WRITE | ECORE_FD_ERROR, _ecore_wl_cb_handle_data, _ecore_wl_disp, NULL, NULL); @@ -464,12 +463,12 @@ _ecore_wl_shutdown(Eina_Bool close) _ecore_wl_input_del(in); EINA_INLIST_FOREACH_SAFE(_ecore_wl_disp->globals, tmp, global) - { - _ecore_wl_disp->globals = eina_inlist_remove - (_ecore_wl_disp->globals, EINA_INLIST_GET(global)); - free(global->interface); - free(global); - } + { + _ecore_wl_disp->globals = eina_inlist_remove + (_ecore_wl_disp->globals, EINA_INLIST_GET(global)); + free(global->interface); + free(global); + } _ecore_wl_xkb_shutdown(_ecore_wl_disp); @@ -676,8 +675,8 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_ EINA_INLIST_FOREACH_SAFE(ewd->globals, tmp, global) { if (global->id != id) continue; - ewd->globals = - eina_inlist_remove(ewd->globals, EINA_INLIST_GET(global)); + ewd->globals = eina_inlist_remove(ewd->globals, + EINA_INLIST_GET(global)); free(global->interface); free(global); } --
