mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-11 18:39:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

run: Handle non-default WAYLAND_DISPLAY

Browse Source 
WAYLAND_DISPLAY can be other than "wayland-0" for various reasons, such
as using a custom Wayland display server or the session display server
using a custom display name.

Note that for xdg-desktop-portal to support showing portal windows, the
xdg-desktop-portal service MUST use the same WAYLAND_DISPLAY.

(cherry picked from commit a1ff20ca0e)
This commit is contained in:
Jonas Ådahl
2017-04-17 13:45:53 +08:00
committed by Alexander Larsson
parent 414d699621
commit 304c127348
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/flatpak-run.c
View File

@@ -1969,8 +1969,16 @@ static void
flatpak_run_add_wayland_args (GPtrArray *argv_array,
char ***envp_p)
{
g_autofree char *wayland_socket = g_build_filename (g_get_user_runtime_dir (), "wayland-0", NULL);
g_autofree char *sandbox_wayland_socket = g_strdup_printf ("/run/user/%d/wayland-0", getuid ());
const char *wayland_display;
g_autofree char *wayland_socket = NULL;
g_autofree char *sandbox_wayland_socket = NULL;
wayland_display = g_getenv ("WAYLAND_DISPLAY");
if (!wayland_display)
wayland_display = "wayland-0";
wayland_socket = g_build_filename (g_get_user_runtime_dir (), wayland_display, NULL);
sandbox_wayland_socket = g_strdup_printf ("/run/user/%d/%s", getuid (), wayland_display);
if (g_file_test (wayland_socket, G_FILE_TEST_EXISTS))
{