diff options
| author | Cosimo Cecchi <cosimo@endlessm.com> | 2018-11-05 08:42:12 -0800 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2021-07-09 17:03:59 +0000 |
| commit | 3096ed862717103e87b78afd94e92dc461e30509 (patch) | |
| tree | 91e4d06f748d35b149b15cffb07ce3c1bcb52a6b /daemon/gdm-session-worker.c | |
| parent | 48d92c7e9ae12fd203d1ac120467bf2b9c934331 (diff) | |
| download | gdm-3096ed862717103e87b78afd94e92dc461e30509.tar.gz | |
launch-environment: Read XDG_DATA_DIRS from env.d for initial-setup
In the initial setup session we may need to run a Flatpak application;
Flatpak requires XDG_DATA_DIRS to include its locations to work
correctly, but that's not set at the moment for the initial-setup
session.
This commit borrows the code from GdmSessionWorker to read
XDG_DATA_DIRS from gdm's env.d machinery for the initial-setup session
as well.
Diffstat (limited to 'daemon/gdm-session-worker.c')
| -rw-r--r-- | daemon/gdm-session-worker.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index ee7ffef9..facd05f4 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -1574,12 +1574,7 @@ load_env_func (const char *var, gpointer user_data) { GdmSessionWorker *worker = user_data; - char *expanded; - - expanded = gdm_shell_expand (value, get_var_cb, worker); - expanded = g_strchomp (expanded); - gdm_session_worker_set_environment_variable (worker, var, expanded); - g_free (expanded); + gdm_session_worker_set_environment_variable (worker, var, value); } static gboolean @@ -2078,7 +2073,7 @@ gdm_session_worker_start_session (GdmSessionWorker *worker, #endif if (!worker->priv->is_program_session) { - gdm_load_env_d (load_env_func, worker); + gdm_load_env_d (load_env_func, get_var_cb, worker); } environment = gdm_session_worker_get_environment (worker); |