brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Drop dependency on ClutterX11 headers/gir

Browse Source 
This can be replaced with MetaX11Display nowadays.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1841>
This commit is contained in:
Carlos Garnacho 2021-05-11 12:44:20 +02:00 committed by Marge Bot
parent 48d5740443
commit 82450e1060
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gnome-shell-plugin.c
View File

@ -37,10 +37,10 @@
#include <string.h> #include <string.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11.h>
#include <gjs/gjs.h> #include <gjs/gjs.h>
#include <meta/display.h> #include <meta/display.h>
#include <meta/meta-plugin.h> #include <meta/meta-plugin.h>
#include <meta/meta-x11-display.h>
#include <meta/util.h> #include <meta/util.h>
#include "shell-global-private.h" #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); CoglRenderer *renderer = cogl_display_get_renderer (cogl_display);
const char * (* query_extensions_string) (Display *dpy, int screen); const char * (* query_extensions_string) (Display *dpy, int screen);
Bool (* query_extension) (Display *dpy, int *error, int *event); 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; Display *xdisplay;
int screen_number; int screen_number;
const char *glx_extensions; 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) if (cogl_renderer_get_winsys_id (renderer) != COGL_WINSYS_ID_GLX)
return FALSE; return FALSE;
xdisplay = clutter_x11_get_default_display (); xdisplay = meta_x11_display_get_xdisplay (x11_display);
query_extensions_string = query_extensions_string =
(void *) cogl_get_proc_address ("glXQueryExtensionsString"); (void *) cogl_get_proc_address ("glXQueryExtensionsString");

1
src/main.c
View File

@ -10,7 +10,6 @@
#include <cogl-pango/cogl-pango.h> #include <cogl-pango/cogl-pango.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <girepository.h> #include <girepository.h>

1
src/meson.build
View File

@ -213,7 +213,6 @@ libshell_dep = declare_dependency(link_with: libshell)
libshell_gir_includes = [ libshell_gir_includes = [
'Clutter-@0@'.format(mutter_api_version), 'Clutter-@0@'.format(mutter_api_version),
'ClutterX11-@0@'.format(mutter_api_version),
'Meta-@0@'.format(mutter_api_version), 'Meta-@0@'.format(mutter_api_version),
'Gcr-3', 'Gcr-3',
'PolkitAgent-1.0' 'PolkitAgent-1.0'

1
src/shell-embedded-window.c
View File

@ -3,7 +3,6 @@
#include "config.h" #include "config.h"
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <clutter/x11/clutter-x11.h>
#include "shell-embedded-window-private.h" #include "shell-embedded-window-private.h"

1
src/shell-global.c
View File

@ -16,7 +16,6 @@
#include <locale.h> #include <locale.h>
#include <X11/extensions/Xfixes.h> #include <X11/extensions/Xfixes.h>
#include <clutter/x11/clutter-x11.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <girepository.h> #include <girepository.h>

1
src/shell-tray-manager.c
View File

@ -3,7 +3,6 @@
#include "config.h" #include "config.h"
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11.h>
#include <girepository.h> #include <girepository.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <meta/display.h> #include <meta/display.h>