summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--daemon/gdm-welcome-session.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b127b8a8..26662add 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2008-07-30 William Jon McCann <jmccann@redhat.com>
* configure.ac: Post release version bump
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;