devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=20c59557db5cd5f321d1ef4a4f34b972fb2b0c01
commit 20c59557db5cd5f321d1ef4a4f34b972fb2b0c01 Author: Chris Michael <[email protected]> Date: Fri Oct 3 13:17:52 2014 -0400 only call ecore-x functions here if we are Not build for wayland-only Signed-off-by: Chris Michael <[email protected]> --- src/bin/e_signals.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c index 358ca73..db45683 100644 --- a/src/bin/e_signals.c +++ b/src/bin/e_signals.c @@ -14,7 +14,7 @@ static volatile Eina_Bool _e_x_composite_shutdown_try = 0; static void _e_x_composite_shutdown(void) { -#ifdef E_COMP_X_H +#ifndef HAVE_WAYLAND_ONLY // Ecore_X_Display *dpy; Ecore_X_Window root; @@ -66,7 +66,7 @@ EAPI void e_sigseg_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { _e_x_composite_shutdown(); -#ifdef E_COMP_X_H +#ifndef HAVE_WAYLAND_ONLY ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); @@ -97,7 +97,7 @@ EAPI void e_sigfpe_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { _e_x_composite_shutdown(); -#ifdef E_COMP_X_H +#ifndef HAVE_WAYLAND_ONLY ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); @@ -110,7 +110,7 @@ EAPI void e_sigbus_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { _e_x_composite_shutdown(); -#ifdef E_COMP_X_H +#ifndef HAVE_WAYLAND_ONLY ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); @@ -123,7 +123,7 @@ EAPI void e_sigabrt_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { _e_x_composite_shutdown(); -#ifdef E_COMP_X_H +#ifndef HAVE_WAYLAND_ONLY ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); @@ -131,4 +131,3 @@ e_sigabrt_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED_ #endif e_alert_show(); } - --
