From f258556cec6aefe581f19214ce57e74b2d27c8a5 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 18 Oct 2012 14:54:08 -0400 Subject: [PATCH] MetaPluginManager: don't send events to Clutter twice When support for multiple plugins was removed, the logic that was supposed to send events to Clutter directly *only if there is no filter function from a plugin* was broken, so events were being sent to Clutter twice if Clutter didn't consume them the first time. https://bugzilla.gnome.org/show_bug.cgi?id=686406 --- src/compositor/meta-plugin-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c index d404be3eb..ff391c2fc 100644 --- a/src/compositor/meta-plugin-manager.c +++ b/src/compositor/meta-plugin-manager.c @@ -305,8 +305,8 @@ meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr, * of that plugin to pass events to Clutter. Otherwise, we send the * event directly to Clutter ourselves. */ - if (klass->xevent_filter && klass->xevent_filter (plugin, xev)) - return TRUE; + if (klass->xevent_filter) + return klass->xevent_filter (plugin, xev); else return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE; }