|
 |
ca70cf |
From 5c86f9731ed715bcf603c9dd93dced002f11b996 Mon Sep 17 00:00:00 2001
|
|
|
ca70cf |
From: Ray Strode <rstrode@redhat.com>
|
|
|
ca70cf |
Date: Tue, 17 Oct 2017 10:06:22 -0400
|
|
|
ca70cf |
Subject: [PATCH] Revert "gdm-sessions: force a session bus for non-seat0
|
|
|
ca70cf |
session"
|
|
|
ca70cf |
|
|
|
ca70cf |
This reverts commit 2b52d8933c8ab38e7ee83318da2363d00d8c5581.
|
|
|
ca70cf |
---
|
|
|
ca70cf |
daemon/gdm-session.c | 7 +------
|
|
|
ca70cf |
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
ca70cf |
|
|
|
ca70cf |
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
|
|
ca70cf |
index 3e71ad2f..3a1b7f23 100644
|
|
|
ca70cf |
--- a/daemon/gdm-session.c
|
|
|
ca70cf |
+++ b/daemon/gdm-session.c
|
|
|
ca70cf |
@@ -2870,66 +2870,61 @@ gdm_session_start_session (GdmSession *self,
|
|
|
ca70cf |
allow_remote_connections = TRUE;
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
if (run_launcher) {
|
|
|
ca70cf |
if (is_x11) {
|
|
|
ca70cf |
program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s %s\"%s\"",
|
|
|
ca70cf |
run_xsession_script? "--run-script " : "",
|
|
|
ca70cf |
allow_remote_connections? "--allow-remote-connections " : "",
|
|
|
ca70cf |
command);
|
|
|
ca70cf |
} else {
|
|
|
ca70cf |
program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session \"%s\"",
|
|
|
ca70cf |
command);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
} else if (run_xsession_script) {
|
|
|
ca70cf |
program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
|
|
|
ca70cf |
} else {
|
|
|
ca70cf |
program = g_strdup (command);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
g_free (command);
|
|
|
ca70cf |
} else {
|
|
|
ca70cf |
if (run_launcher) {
|
|
|
ca70cf |
if (is_x11) {
|
|
|
ca70cf |
program = g_strdup_printf (LIBEXECDIR "/gdm-x-session \"%s\"",
|
|
|
ca70cf |
self->priv->selected_program);
|
|
|
ca70cf |
} else {
|
|
|
ca70cf |
program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session \"%s\"",
|
|
|
ca70cf |
self->priv->selected_program);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
} else {
|
|
|
ca70cf |
- if (g_strcmp0 (self->priv->display_seat_id, "seat0") != 0) {
|
|
|
ca70cf |
- program = g_strdup_printf ("dbus-run-session -- %s",
|
|
|
ca70cf |
- self->priv->selected_program);
|
|
|
ca70cf |
- } else {
|
|
|
ca70cf |
- program = g_strdup (self->priv->selected_program);
|
|
|
ca70cf |
- }
|
|
|
ca70cf |
+ program = g_strdup (self->priv->selected_program);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
set_up_session_environment (self);
|
|
|
ca70cf |
send_environment (self, conversation);
|
|
|
ca70cf |
|
|
|
ca70cf |
gdm_dbus_worker_call_start_program (conversation->worker_proxy,
|
|
|
ca70cf |
program,
|
|
|
ca70cf |
conversation->worker_cancellable,
|
|
|
ca70cf |
(GAsyncReadyCallback) on_start_program_cb,
|
|
|
ca70cf |
conversation);
|
|
|
ca70cf |
g_free (program);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
static void
|
|
|
ca70cf |
stop_all_conversations (GdmSession *self)
|
|
|
ca70cf |
{
|
|
|
ca70cf |
stop_all_other_conversations (self, NULL, TRUE);
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
static void
|
|
|
ca70cf |
do_reset (GdmSession *self)
|
|
|
ca70cf |
{
|
|
|
ca70cf |
stop_all_conversations (self);
|
|
|
ca70cf |
|
|
|
ca70cf |
g_list_free_full (self->priv->pending_worker_connections, g_object_unref);
|
|
|
ca70cf |
self->priv->pending_worker_connections = NULL;
|
|
|
ca70cf |
|
|
|
ca70cf |
g_free (self->priv->selected_user);
|
|
|
ca70cf |
self->priv->selected_user = NULL;
|
|
|
ca70cf |
--
|
|
|
ca70cf |
2.14.2
|
|
|
ca70cf |
|