summaryrefslogtreecommitdiff
path: root/src/x11/window-x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/x11/window-x11.c')
-rw-r--r--src/x11/window-x11.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 637f7a3dc..93cacb882 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -3624,6 +3624,10 @@ is_our_xwindow (MetaX11Display *x11_display,
Window xwindow,
XWindowAttributes *attrs)
{
+ MetaDisplay *display;
+ MetaContext *context;
+ MetaBackend *backend;
+
if (xwindow == x11_display->no_focus_window)
return TRUE;
@@ -3639,15 +3643,13 @@ is_our_xwindow (MetaX11Display *x11_display,
if (xwindow == x11_display->composite_overlay_window)
return TRUE;
- {
- MetaBackend *backend = meta_get_backend ();
+ display = meta_x11_display_get_display (x11_display);
+ context = meta_display_get_context (display);
+ backend = meta_context_get_backend (context);
- if (META_IS_BACKEND_X11 (backend))
- {
- if (xwindow == meta_backend_x11_get_xwindow (META_BACKEND_X11 (backend)))
- return TRUE;
- }
- }
+ if (META_IS_BACKEND_X11 (backend) &&
+ xwindow == meta_backend_x11_get_xwindow (META_BACKEND_X11 (backend)))
+ return TRUE;
/* Any windows created via meta_create_offscreen_window */
if (attrs->override_redirect &&