luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDesktopAppInfo: Do not set the DISPLAY in gio

Browse Source 
The environment variable DISPLAY makes sense only for X11, it should
not be set in gio.

Beside, if the backend is not X11 but Wayland, forcing the value of
DISPLAY to the Wayland display will confuse the backend selection and
possibly crash the applications.

https://bugzilla.gnome.org/show_bug.cgi?id=754983
This commit is contained in:
Olivier Fourdan 2015-09-15 09:22:12 +02:00 committed by Matthias Clasen
parent 212b0c28cc
commit 4919c25d49
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdesktopappinfo.c
View File

@ -2669,7 +2669,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
GPid pid;
GList *launched_uris;
GList *iter;
char *display, *sn_id = NULL;
char *sn_id = NULL;
old_uris = uris;
if (!expand_application_parameters (info, exec_line, &uris, &argc, &argv, error))
@ -2708,18 +2708,11 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
data.pid_envvar = NULL;
}
display = NULL;
sn_id = NULL;
if (launch_context)
{
GList *launched_files = create_files_for_uris (launched_uris);
display = g_app_launch_context_get_display (launch_context,
G_APP_INFO (info),
launched_files);
if (display)
envp = g_environ_setenv (envp, "DISPLAY", display, TRUE);
if (info->startup_notify)
{
sn_id = g_app_launch_context_get_startup_notify_id (launch_context,
@ -2744,7 +2737,6 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
if (sn_id)
g_app_launch_context_launch_failed (launch_context, sn_id);
g_free (display);
g_free (sn_id);
g_list_free (launched_uris);
@ -2771,11 +2763,10 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
notify_desktop_launch (session_bus,
info,
pid,
display,
NULL,
sn_id,
launched_uris);
g_free (display);
g_free (sn_id);
g_list_free (launched_uris);