gdm r6345 - in branches/gnome-2-22: . daemon

[mccann svn gnome org]

Author: mccann
Date: Thu Jul 31 21:17:50 2008
New Revision: 6345
URL: http://svn.gnome.org/viewvc/gdm?rev=6345&view=rev

Log:
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.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/daemon/gdm-welcome-session.c

Modified: branches/gnome-2-22/daemon/gdm-welcome-session.c
==============================================================================
--- branches/gnome-2-22/daemon/gdm-welcome-session.c	(original)
+++ branches/gnome-2-22/daemon/gdm-welcome-session.c	Thu Jul 31 21:17:50 2008
@@ -705,15 +705,15 @@
 
         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;