[mutter] clutter/x11: Remove X11 display name field



commit a545fecad344eb8f4332155b8d49d2ed200a6ace
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Tue Sep 14 16:35:36 2021 +0200

    clutter/x11: Remove X11 display name field
    
    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>

 src/backends/x11/meta-clutter-backend-x11.c | 6 +-----
 src/backends/x11/meta-clutter-backend-x11.h | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c
index f296bf343e..e7577576cc 100644
--- a/src/backends/x11/meta-clutter-backend-x11.c
+++ b/src/backends/x11/meta-clutter-backend-x11.c
@@ -188,8 +188,6 @@ meta_clutter_backend_x11_post_parse (ClutterBackend  *backend,
   backend_x11->xwin_root = RootWindow (backend_x11->xdisplay,
                                        backend_x11->xscreen_num);
 
-  backend_x11->display_name = g_strdup (clutter_display_name);
-
   if (clutter_synchronise)
     XSynchronize (backend_x11->xdisplay, True);
 
@@ -211,7 +209,7 @@ meta_clutter_backend_x11_post_parse (ClutterBackend  *backend,
   g_free (clutter_display_name);
 
   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->xscreen_num,
            (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);
 
-  g_free (backend_x11->display_name);
-
   meta_clutter_x11_remove_filter (cogl_xlib_filter, gobject);
 
   XCloseDisplay (backend_x11->xdisplay);
diff --git a/src/backends/x11/meta-clutter-backend-x11.h b/src/backends/x11/meta-clutter-backend-x11.h
index d91a2f3af8..9cbb72f9c7 100644
--- a/src/backends/x11/meta-clutter-backend-x11.h
+++ b/src/backends/x11/meta-clutter-backend-x11.h
@@ -34,7 +34,6 @@ struct _MetaClutterBackendX11
   ClutterBackend parent_instance;
 
   Display *xdisplay;
-  char   *display_name;
 
   Screen  *xscreen;
   int      xscreen_num;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]