gdm r5635 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Fri Jan 25 16:26:40 2008
New Revision: 5635
URL: http://svn.gnome.org/viewvc/gdm?rev=5635&view=rev

Log:
2008-01-25  William Jon McCann  <mccann jhu edu>

	* daemon/gdm-local-display-factory.c: (store_display),
	(gdm_local_display_factory_create_transient_display),
	(gdm_local_display_factory_create_product_display),
	(create_display), (create_display_for_device),
	(gdm_local_display_factory_start):
	Don't use HAL to get seats since we don't know what to do
	with that info yet.  Hardcode starting one display for
	Seat1 and set the seat-id for all local displays.



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

Modified: trunk/daemon/gdm-local-display-factory.c
==============================================================================
--- trunk/daemon/gdm-local-display-factory.c	(original)
+++ trunk/daemon/gdm-local-display-factory.c	Fri Jan 25 16:26:40 2008
@@ -175,7 +175,6 @@
 
         /* now fill our reserved spot */
         g_hash_table_insert (factory->priv->displays, GUINT_TO_POINTER (num), NULL);
-
 }
 
 /*
@@ -209,6 +208,9 @@
                 goto out;
         }
 
+        /* FIXME: don't hardcode seat1? */
+        g_object_set (display, "seat-id", "org.freedesktop.ConsoleKit.Seat1", NULL);
+
         store_display (factory, num, display);
 
         if (! gdm_display_manage (display)) {
@@ -258,6 +260,9 @@
                 goto out;
         }
 
+        /* FIXME: don't hardcode seat1? */
+        g_object_set (display, "seat-id", "org.freedesktop.ConsoleKit.Seat1", NULL);
+
         store_display (factory, num, display);
 
         if (! gdm_display_manage (display)) {
@@ -278,9 +283,8 @@
         return ret;
 }
 
-static void
-create_display_for_device (GdmLocalDisplayFactory *factory,
-                           DBusGProxy             *device_proxy)
+static GdmDisplay *
+create_display (GdmLocalDisplayFactory *factory)
 {
         GdmDisplay *display;
         guint32     num;
@@ -293,16 +297,20 @@
         display = gdm_static_display_new (num);
 #endif
         if (display == NULL) {
-                g_warning ("Unable to create display: %d", 0);
-                return;
+                g_warning ("Unable to create display: %d", num);
+                return NULL;
         }
 
         if (! gdm_display_create_authority (display)) {
                 g_warning ("Unable to set up access control for display %d",
-                           0);
-                return;
+                           num);
+                g_object_unref (display);
+                return NULL;
         }
 
+        /* FIXME: don't hardcode seat1? */
+        g_object_set (display, "seat-id", "org.freedesktop.ConsoleKit.Seat1", NULL);
+
         store_display (factory, num, display);
 
         /* let store own the ref */
@@ -311,6 +319,16 @@
         if (! gdm_display_manage (display)) {
                 gdm_display_unmanage (display);
         }
+
+        return display;
+}
+
+#if 0
+static void
+create_display_for_device (GdmLocalDisplayFactory *factory,
+                           DBusGProxy             *device_proxy)
+{
+        create_display (factory);
 }
 
 static void
@@ -380,6 +398,7 @@
 
         g_strfreev (devices);
 }
+#endif
 
 static gboolean
 gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
@@ -391,8 +410,12 @@
 
         ret = TRUE;
 
-        /* FIXME: */
+        /* FIXME: use seat configuration */
+#if 0
         create_displays_for_pci_devices (factory);
+#else
+        create_display (factory);
+#endif
 
         return ret;
 }