From 9c4f19e8ed33319ddfc8962d201aa5e2feef0039 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 15 Feb 2020 10:30:55 -0500 Subject: [PATCH] x11: Don't pass a GdkEvent to xsettings filters The filter functions never look at that event, and we want to get out of the business of passing half- constructed events around. --- gdk/x11/gdkeventsource.c | 4 ++-- gdk/x11/xsettings-client.c | 2 -- gdk/x11/xsettings-client.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index d32bd7a033..01d48a7eff 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -240,11 +240,11 @@ gdk_event_source_translate_event (GdkX11Display *x11_display, /* apply XSettings filters */ if (xevent->xany.window == XRootWindow (dpy, 0)) - result = gdk_xsettings_root_window_filter (xevent, event, x11_screen); + result = gdk_xsettings_root_window_filter (xevent,x11_screen); if (result == GDK_FILTER_CONTINUE && xevent->xany.window == x11_screen->xsettings_manager_window) - result = gdk_xsettings_manager_window_filter (xevent, event, x11_screen); + result = gdk_xsettings_manager_window_filter (xevent, x11_screen); cache = gdk_surface_cache_get (display); if (cache) diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c index d43d06a0e5..f3e83f5e7a 100644 --- a/gdk/x11/xsettings-client.c +++ b/gdk/x11/xsettings-client.c @@ -506,7 +506,6 @@ check_manager_window (GdkX11Screen *x11_screen, GdkFilterReturn gdk_xsettings_root_window_filter (const XEvent *xev, - GdkEvent *event, gpointer data) { GdkX11Screen *x11_screen = data; @@ -530,7 +529,6 @@ gdk_xsettings_root_window_filter (const XEvent *xev, GdkFilterReturn gdk_xsettings_manager_window_filter (const XEvent *xev, - GdkEvent *event, gpointer data) { GdkX11Screen *x11_screen = data; diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h index 73841afb62..aab28d7732 100644 --- a/gdk/x11/xsettings-client.h +++ b/gdk/x11/xsettings-client.h @@ -31,10 +31,8 @@ void _gdk_x11_xsettings_finish (GdkX11Screen *x11_screen); void _gdk_x11_settings_force_reread (GdkX11Screen *x11_screen); GdkFilterReturn gdk_xsettings_root_window_filter (const XEvent *xevent, - GdkEvent *event, gpointer data); GdkFilterReturn gdk_xsettings_manager_window_filter (const XEvent *xevent, - GdkEvent *event, gpointer data);