Skip to content

xfce-spawn: Do not change DISPLAY on non-X11 displays

Joan Bruguera requested to merge (removed):master into master

xfce_spawn_process sets the DISPLAY environment variable according to gdk_screen_make_display_name (screen), but gdk_screen_make_display_name only returns an X11 display name on X11 environments, so the DISPLAY environment variable gets set to the wrong value for non-X11 environments.

In particular, for Wayland, it returns WAYLAND_DISPLAY, so DISPLAY gets overridden to WAYLAND_DISPLAY, which breaks spawning X11 applications on XWayland setups (e.g. when launching from Thunar custom actions).

Only set DISPLAY on X11 displays, and otherwise leave DISPLAY as-is.

Original patch by Andre Miranda, misc. cleanups by me.

Fixes: #13 (closed)

Edited by Gaël Bonithon

Merge request reports