From 7247b8d81bf52481a5fd19a6ef02c9ad0e49dca7 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 19 Jun 2014 21:10:09 +0200 Subject: [PATCH] backend-x11: Remove pointless goto The function is not as complex as needing that, plus it always jumped anytime bypass_clutter is TRUE, so make all conditional code depend on that. --- src/backends/x11/meta-backend-x11.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c index 7ebeda884..32b174db0 100644 --- a/src/backends/x11/meta-backend-x11.c +++ b/src/backends/x11/meta-backend-x11.c @@ -142,17 +142,14 @@ handle_host_xevent (MetaBackend *backend, MetaMonitorManager *manager = meta_backend_get_monitor_manager (backend); if (META_IS_MONITOR_MANAGER_XRANDR (manager) && meta_monitor_manager_xrandr_handle_xevent (META_MONITOR_MANAGER_XRANDR (manager), event)) - { - bypass_clutter = TRUE; - goto out; - } + bypass_clutter = TRUE; } - maybe_spoof_event_as_stage_event (x11, event); - - out: if (!bypass_clutter) - clutter_x11_handle_event (event); + { + maybe_spoof_event_as_stage_event (x11, event); + clutter_x11_handle_event (event); + } XFreeEventData (priv->xdisplay, &event->xcookie); }