isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-27 18:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Check environment variables before giving to GAppLaunchContext

Browse Source 
Depending on the type of session, one or the other might be NULL, which
is not meant to be handled by these functions. Check for both DISPLAY
envvars before setting them on the GAppLaunchContext.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/586
This commit is contained in:
Carlos Garnacho 2019-05-06 13:00:09 +02:00
parent ee92e4fe13
commit 0a3cddeecf
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/meta-launch-context.c
View File

@ -110,13 +110,24 @@ static void
meta_launch_context_constructed (GObject *object) meta_launch_context_constructed (GObject *object)
{ {
MetaLaunchContext *context = META_LAUNCH_CONTEXT (object); MetaLaunchContext *context = META_LAUNCH_CONTEXT (object);
const char *x11_display, *wayland_display;
G_OBJECT_CLASS (meta_launch_context_parent_class)->constructed (object); G_OBJECT_CLASS (meta_launch_context_parent_class)->constructed (object);
g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context), x11_display = getenv ("DISPLAY");
"DISPLAY", getenv ("DISPLAY")); wayland_display = getenv ("WAYLAND_DISPLAY");
g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
"WAYLAND_DISPLAY", getenv ("WAYLAND_DISPLAY")); if (x11_display)
{
g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
"DISPLAY", x11_display);
}
if (wayland_display)
{
g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (context),
"WAYLAND_DISPLAY", wayland_display);
}
} }
static gchar * static gchar *