summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-11-15 11:30:14 +0100
committerCarlos Garnacho <mrgarnacho@gmail.com>2020-02-29 22:36:41 +0000
commit2600d5bcb7b5b8f1afce5602ab9245afb0e96555 (patch)
tree574bb991dbb35ba5e310b281f256fbbbb00a56f7
parent34d845ba4189454d5a94a0dcbe57caaf980745f7 (diff)
downloadgnome-settings-daemon-2600d5bcb7b5b8f1afce5602ab9245afb0e96555.tar.gz
common: Replace DISPLAY with setup-only side channel display
If it exists and is available, this display should be used to let g-s-d x11 services (i.e. gsd-xsettings) set up the X11 server before a Xwayland client proceeds.
-rw-r--r--plugins/common/daemon-skeleton-gtk.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
index 87bafb3d..f39fd5d6 100644
--- a/plugins/common/daemon-skeleton-gtk.h
+++ b/plugins/common/daemon-skeleton-gtk.h
@@ -222,6 +222,12 @@ main (int argc, char **argv)
set_empty_gtk_theme (TRUE);
#ifdef GDK_BACKEND
+ {
+ const gchar *setup_display = getenv ("GNOME_SETUP_DISPLAY");
+ if (setup_display)
+ g_setenv ("DISPLAY", setup_display, TRUE);
+ }
+
gdk_set_allowed_backends (GDK_BACKEND);
#endif