isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/x11: Remove X11 display name field

Browse Source 
It was unused, and we don't even let clutter open the display itself.
Lets clean that up.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2002>
This commit is contained in:
Jonas Ådahl 2021-09-14 16:35:36 +02:00 committed by Marge Bot
parent fbb586283f
commit a545fecad3
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/x11/meta-clutter-backend-x11.c
View File

@ -188,8 +188,6 @@ meta_clutter_backend_x11_post_parse (ClutterBackend *backend,
backend_x11->xwin_root = RootWindow (backend_x11->xdisplay, backend_x11->xwin_root = RootWindow (backend_x11->xdisplay,
backend_x11->xscreen_num); backend_x11->xscreen_num);
backend_x11->display_name = g_strdup (clutter_display_name);
if (clutter_synchronise) if (clutter_synchronise)
XSynchronize (backend_x11->xdisplay, True); XSynchronize (backend_x11->xdisplay, True);
@ -211,7 +209,7 @@ meta_clutter_backend_x11_post_parse (ClutterBackend *backend,
g_free (clutter_display_name); g_free (clutter_display_name);
g_debug ("X Display '%s'[%p] opened (screen:%d, root:%u, dpi:%f)", g_debug ("X Display '%s'[%p] opened (screen:%d, root:%u, dpi:%f)",
backend_x11->display_name, g_getenv ("DISPLAY"),
backend_x11->xdisplay, backend_x11->xdisplay,
backend_x11->xscreen_num, backend_x11->xscreen_num,
(unsigned int) backend_x11->xwin_root, (unsigned int) backend_x11->xwin_root,
@ -254,8 +252,6 @@ meta_clutter_backend_x11_finalize (GObject *gobject)
{ {
MetaClutterBackendX11 *backend_x11 = META_CLUTTER_BACKEND_X11 (gobject); MetaClutterBackendX11 *backend_x11 = META_CLUTTER_BACKEND_X11 (gobject);
g_free (backend_x11->display_name);
meta_clutter_x11_remove_filter (cogl_xlib_filter, gobject); meta_clutter_x11_remove_filter (cogl_xlib_filter, gobject);
XCloseDisplay (backend_x11->xdisplay); XCloseDisplay (backend_x11->xdisplay);

1
src/backends/x11/meta-clutter-backend-x11.h
View File

@ -34,7 +34,6 @@ struct _MetaClutterBackendX11
ClutterBackend parent_instance; ClutterBackend parent_instance;
Display *xdisplay; Display *xdisplay;
char *display_name;
Screen *xscreen; Screen *xscreen;
int xscreen_num; int xscreen_num;