diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-07-31 21:17:50 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-07-31 21:17:50 +0000 |
| commit | 0215761830a1c65b0f6727fd5e1e111da53c9a2c (patch) | |
| tree | 000817783d85d1b623a01daa5a9055df2312d901 | |
| parent | b7bcfb9ea99f19ecc49aeae6781ce656e5f4f956 (diff) | |
| download | gdm-0215761830a1c65b0f6727fd5e1e111da53c9a2c.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=/branches/gnome-2-22/; revision=6345
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | daemon/gdm-welcome-session.c | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -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-10 Matthias Clasen <mclasen@redhat.com> * gui/simple-greeter/gdm-language-option-widget.c: diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c index 4651d032..3e256888 100644 --- a/daemon/gdm-welcome-session.c +++ b/daemon/gdm-welcome-session.c @@ -705,15 +705,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; |