diff options
| author | Ray Strode <rstrode@redhat.com> | 2009-06-23 23:03:49 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2009-08-03 15:50:58 -0400 |
| commit | 0cbe56fab42f7bc68855b4c85648bddabf725ed3 (patch) | |
| tree | 6c585648a536d7a630d807fd0f933f098025da17 | |
| parent | 5875501cfca9d30bd76851750ee342b92e0f328f (diff) | |
| download | gdm-0cbe56fab42f7bc68855b4c85648bddabf725ed3.tar.gz | |
Drop create_display in local display factory
It's really only there to handle respawn for static displays, but
static displays handle respawn in a different way so it's dead code.
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index 5fc1b897..8ebc9668 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -86,7 +86,6 @@ static void gdm_local_display_factory_class_init (GdmLocalDisplayFactoryC static void gdm_local_display_factory_init (GdmLocalDisplayFactory *factory); static void gdm_local_display_factory_finalize (GObject *object); -static GdmDisplay *create_display (GdmLocalDisplayFactory *factory); static gboolean create_static_displays (GdmLocalDisplayFactory *factory); static void on_display_status_changed (GdmDisplay *display, GParamSpec *arg1, @@ -381,7 +380,6 @@ on_display_status_changed (GdmDisplay *display, gdm_display_store_remove (store, display); /* reset num failures */ factory->priv->num_failures = 0; - create_display (factory); break; case GDM_DISPLAY_FAILED: /* leave the display number in factory->priv->displays @@ -393,8 +391,6 @@ on_display_status_changed (GdmDisplay *display, g_warning ("GdmLocalDisplayFactory: maximum number of X display failures reached: check X server log for errors"); exit (1); } - - create_display (factory); break; case GDM_DISPLAY_UNMANAGED: break; @@ -408,44 +404,6 @@ on_display_status_changed (GdmDisplay *display, } } -static GdmDisplay * -create_display (GdmLocalDisplayFactory *factory) -{ - GdmDisplay *display; - guint32 num; - - num = take_next_display_number (factory); - -#if 0 - display = gdm_static_factory_display_new (num); -#else - display = gdm_static_display_new (num); -#endif - if (display == NULL) { - g_warning ("Unable to create display: %d", num); - return NULL; - } - - /* FIXME: don't hardcode seat1? */ - g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL); - - g_signal_connect (display, - "notify::status", - G_CALLBACK (on_display_status_changed), - factory); - - store_display (factory, num, display); - - /* let store own the ref */ - g_object_unref (display); - - if (! gdm_display_manage (display)) { - gdm_display_unmanage (display); - } - - return display; -} - #ifndef HAVE_STRREP static void strrep (char* in, char** out, char* old, char* new) |