gdm r5817 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Wed Feb 20 15:07:31 2008
New Revision: 5817
URL: http://svn.gnome.org/viewvc/gdm?rev=5817&view=rev

Log:
2008-02-20  Ray Strode  <rstrode redhat com>

	* daemon/gdm-local-display-factory.c (create_display)
	* daemon/gdm-display.c (gdm_display_real_manage):
	create authority file in gdm_display_manage instead of
	create_display so that it gets recreated when the display
	gets finished (and remanaged, not destroyed)


Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-display.c
   trunk/daemon/gdm-local-display-factory.c

Modified: trunk/daemon/gdm-display.c
==============================================================================
--- trunk/daemon/gdm-display.c	(original)
+++ trunk/daemon/gdm-display.c	Wed Feb 20 15:07:31 2008
@@ -441,10 +441,16 @@
 
         g_debug ("GdmDisplay manage display");
 
-        display->priv->status = GDM_DISPLAY_MANAGED;
-
         g_assert (display->priv->slave_proxy == NULL);
 
+        if (!gdm_display_create_authority (display)) {
+                g_warning ("Unable to set up access control for display %d",
+                           display->priv->x11_display_number);
+                return FALSE;
+        }
+
+        display->priv->status = GDM_DISPLAY_MANAGED;
+
         display->priv->slave_proxy = gdm_slave_proxy_new ();
         g_signal_connect (display->priv->slave_proxy,
                           "exited",

Modified: trunk/daemon/gdm-local-display-factory.c
==============================================================================
--- trunk/daemon/gdm-local-display-factory.c	(original)
+++ trunk/daemon/gdm-local-display-factory.c	Wed Feb 20 15:07:31 2008
@@ -303,13 +303,6 @@
                 return NULL;
         }
 
-        if (! gdm_display_create_authority (display)) {
-                g_warning ("Unable to set up access control for display %d",
-                           num);
-                g_object_unref (display);
-                return NULL;
-        }
-
         /* FIXME: don't hardcode seat1? */
         g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL);