diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c index 41641948b..39af545ac 100644 --- a/src/gnome-shell-plugin.c +++ b/src/gnome-shell-plugin.c @@ -37,10 +37,10 @@ #include #include -#include #include #include #include +#include #include #include "shell-global-private.h" @@ -74,6 +74,8 @@ gnome_shell_plugin_has_swap_event (GnomeShellPlugin *shell_plugin) CoglRenderer *renderer = cogl_display_get_renderer (cogl_display); const char * (* query_extensions_string) (Display *dpy, int screen); Bool (* query_extension) (Display *dpy, int *error, int *event); + MetaDisplay *display = meta_plugin_get_display (META_PLUGIN (shell_plugin)); + MetaX11Display *x11_display = meta_display_get_x11_display (display); Display *xdisplay; int screen_number; const char *glx_extensions; @@ -82,7 +84,7 @@ gnome_shell_plugin_has_swap_event (GnomeShellPlugin *shell_plugin) if (cogl_renderer_get_winsys_id (renderer) != COGL_WINSYS_ID_GLX) return FALSE; - xdisplay = clutter_x11_get_default_display (); + xdisplay = meta_x11_display_get_xdisplay (x11_display); query_extensions_string = (void *) cogl_get_proc_address ("glXQueryExtensionsString"); diff --git a/src/main.c b/src/main.c index 5d07a4301..23944351b 100644 --- a/src/main.c +++ b/src/main.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/src/meson.build b/src/meson.build index d235c3743..53b8b527d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -213,7 +213,6 @@ libshell_dep = declare_dependency(link_with: libshell) libshell_gir_includes = [ 'Clutter-@0@'.format(mutter_api_version), - 'ClutterX11-@0@'.format(mutter_api_version), 'Meta-@0@'.format(mutter_api_version), 'Gcr-3', 'PolkitAgent-1.0' diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c index 31e350657..8fd611287 100644 --- a/src/shell-embedded-window.c +++ b/src/shell-embedded-window.c @@ -3,7 +3,6 @@ #include "config.h" #include -#include #include "shell-embedded-window-private.h" diff --git a/src/shell-global.c b/src/shell-global.c index 027c9d6c4..eff53f396 100644 --- a/src/shell-global.c +++ b/src/shell-global.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c index 03f36a72b..c8e325978 100644 --- a/src/shell-tray-manager.c +++ b/src/shell-tray-manager.c @@ -3,7 +3,6 @@ #include "config.h" #include -#include #include #include #include