diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-02-21 16:09:57 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-02-21 20:21:04 -0500 |
| commit | df206e78cc13d410d5f148a91428244ebd2e5511 (patch) | |
| tree | ace71fa37b8b2d282e08127dd138d2f9ee6e80dd /daemon/gdm-x-session.c | |
| parent | c60b26bce4ce0a82d64934e66d36ae3d96e4516f (diff) | |
| download | gdm-df206e78cc13d410d5f148a91428244ebd2e5511.tar.gz | |
gdm-x-session: set session bus address properly
We weren't setting it in the session environment, but the X server
environment.
Diffstat (limited to 'daemon/gdm-x-session.c')
| -rw-r--r-- | daemon/gdm-x-session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c index 67e236ba..c3c638ef 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c @@ -222,7 +222,6 @@ spawn_x_server (State *state, arguments = g_ptr_array_new (); launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDIN_INHERIT); - g_subprocess_launcher_setenv (launcher, "DBUS_SESSION_BUS_ADDRESS", state->bus_address, TRUE); g_subprocess_launcher_take_fd (launcher, pipe_fds[1], DISPLAY_FILENO); if (g_getenv ("XDG_VTNR") != NULL) { @@ -499,6 +498,7 @@ spawn_session (State *state, g_subprocess_launcher_setenv (launcher, "DISPLAY", state->display_name, TRUE); g_subprocess_launcher_setenv (launcher, "XAUTHORITY", state->auth_file, TRUE); + g_subprocess_launcher_setenv (launcher, "DBUS_SESSION_BUS_ADDRESS", state->bus_address, TRUE); vt = g_getenv ("XDG_VTNR"); |