summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-07-31 21:15:39 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2008-07-31 21:15:39 +0000
commitbda9036c6f98f048724aeb1713fee3c891c2f93c (patch)
tree4fc95793e0b75632f02fef971f89e83ae48bedb4 /daemon
parentcf7f2ecb8d8769a35e6f22e50b1204b7aba93eba (diff)
downloadgdm-bda9036c6f98f048724aeb1713fee3c891c2f93c.tar.gz
Set up the ConsoleKit session before starting dbus so it will get the
2008-07-31 William Jon McCann <jmccann@redhat.com> * daemon/gdm-welcome-session.c (gdm_welcome_session_spawn): Set up the ConsoleKit session before starting dbus so it will get the cookie. svn path=/trunk/; revision=6344
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm-welcome-session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index e21523ef..ca35f317 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -714,15 +714,15 @@ gdm_welcome_session_spawn (GdmWelcomeSession *welcome_session)
g_debug ("GdmWelcomeSession: Running welcome_session process: %s", welcome_session->priv->command);
+ if (welcome_session->priv->register_ck_session) {
+ open_welcome_session (welcome_session);
+ }
+
res = start_dbus_daemon (welcome_session);
if (! res) {
/* FIXME: */
}
- if (welcome_session->priv->register_ck_session) {
- open_welcome_session (welcome_session);
- }
-
env = get_welcome_environment (welcome_session);
error = NULL;