brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Remove MUTTER_DISPLAY env variable

Browse Source 
It is X11 specific and I don't see why it should be used instead of setting
DISPLAY. Nothing seems to set it either in gdm/gnome-session.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3762>
This commit is contained in:
Bilal Elmoussaoui 2024-05-21 10:05:21 +02:00 committed by Marge Bot
parent 97af5f8705
commit b8c5ea4e1f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/x11/cm/meta-backend-x11-cm.c
View File

@ -507,15 +507,9 @@ static void
meta_backend_x11_cm_constructed (GObject *object) meta_backend_x11_cm_constructed (GObject *object)
{ {
MetaBackendX11Cm *x11_cm = META_BACKEND_X11_CM (object); MetaBackendX11Cm *x11_cm = META_BACKEND_X11_CM (object);
const char *display_name;
if (x11_cm->display_name) if (x11_cm->display_name)
display_name = (const char *) x11_cm->display_name; g_setenv ("DISPLAY", x11_cm->display_name, TRUE);
else
display_name = g_getenv ("MUTTER_DISPLAY");
if (display_name)
g_setenv ("DISPLAY", display_name, TRUE);
G_OBJECT_CLASS (meta_backend_x11_cm_parent_class)->constructed (object); G_OBJECT_CLASS (meta_backend_x11_cm_parent_class)->constructed (object);
} }

2
src/core/meta-context-main.c
View File

@ -216,7 +216,7 @@ find_session_type (GError **error)
} }
/* Legacy support for starting through xinit */ /* Legacy support for starting through xinit */
if (is_tty && (g_getenv ("MUTTER_DISPLAY") || g_getenv ("DISPLAY"))) if (is_tty && g_getenv ("DISPLAY"))
{ {
session_type = strdup ("x11"); session_type = strdup ("x11");
goto out; goto out;