[gdm/gnome-3-16] local-display-factory: fix build for non-systemd systems

[Ray Strode <halfline src gnome org>]

commit 267da3eee40e5798e581b43f2627c93363446dc8
Author: Ray Strode <rstrode redhat com>
Date:   Fri Sep 18 08:55:37 2015 -0400

    local-display-factory: fix build for non-systemd systems
    
    commit 78f91789926affd42b159bd7cb037e5dd584e356 switched to
    calling gdm_local_display_factory_sync_seats() unconditionally
    after a display goes away, instead of create_display.
    
    This breaks non-systemd systems since that function only exists
    on systemd systems.
    
    This commit fixes the build by moving the entire logic (both
    systemd and consolekit) from gdm_local_display_factory_start to
    a helper function and using the helper function instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749418

 daemon/gdm-local-display-factory.c |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 1c773a2..85e3f04 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -271,6 +271,26 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
         return ret;
 }
 
+static gboolean
+ensure_initial_display_configuration (GdmLocalDisplayFactory *factory)
+{
+        GdmDisplay *display;
+
+#ifdef WITH_SYSTEMD
+        if (LOGIND_RUNNING()) {
+                if (!factory->priv->seat_new_id) {
+                        gdm_local_display_factory_start_monitor (factory);
+                }
+                return gdm_local_display_factory_sync_seats (factory);
+        }
+#endif
+
+        /* On ConsoleKit just create Seat1, and that's it. */
+        display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
+
+        return display != NULL;
+}
+
 static void
 on_display_status_changed (GdmDisplay             *display,
                            GParamSpec             *arg1,
@@ -317,7 +337,7 @@ on_display_status_changed (GdmDisplay             *display,
                         /* reset num failures */
                         factory->priv->num_failures = 0;
 
-                        gdm_local_display_factory_sync_seats (factory);
+                        ensure_initial_display_configuration (factory);
                 }
                 break;
         case GDM_DISPLAY_FAILED:
@@ -609,7 +629,7 @@ static gboolean
 gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
 {
         GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
-        GdmDisplay             *display;
+        gboolean                display_started;
         GdmDisplayStore *store;
 
         g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
@@ -626,17 +646,9 @@ gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
                           G_CALLBACK (on_display_removed),
                           factory);
 
-#ifdef WITH_SYSTEMD
-        if (LOGIND_RUNNING()) {
-                gdm_local_display_factory_start_monitor (factory);
-                return gdm_local_display_factory_sync_seats (factory);
-        }
-#endif
-
-        /* On ConsoleKit just create Seat1, and that's it. */
-        display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
+        display_started = ensure_initial_display_configuration (factory);
 
-        return display != NULL;
+        return display_started;
 }
 
 static gboolean