require logind support

Now that consolekit support is gone, this commit drops all
the conditionalizing of logind support.

https://bugzilla.gnome.org/show_bug.cgi?id=743940

1 files changed, 4 insertions, 42 deletions

diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index a048b087..612093d6 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -59,10 +59,8 @@ struct GdmLocalDisplayFactoryPrivate
         /* FIXME: this needs to be per seat? */
         guint            num_failures;
 
-#ifdef WITH_SYSTEMD
         guint            seat_new_id;
         guint            seat_removed_id;
-#endif
 };
 
 enum {
@@ -196,16 +194,8 @@ store_display (GdmLocalDisplayFactory *factory,
 static const char *
 get_seat_of_transient_display (GdmLocalDisplayFactory *factory)
 {
-        const char *seat_id = NULL;
-
         /* FIXME: don't hardcode seat */
-#ifdef WITH_SYSTEMD
-        if (LOGIND_RUNNING() > 0) {
-                seat_id = SYSTEMD_SEAT0_PATH;
-        }
-#endif
-
-        return seat_id;
+        return SYSTEMD_SEAT0_PATH;
 }
 
 /*
@@ -230,19 +220,7 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
 
         g_debug ("GdmLocalDisplayFactory: Creating transient display");
 
-#ifdef WITH_SYSTEMD
-        if (LOGIND_RUNNING() > 0) {
-                display = gdm_local_display_new ();
-        }
-#endif
-
-        if (display == NULL) {
-                guint32 num;
-
-                num = take_next_display_number (factory);
-
-                display = gdm_legacy_display_new (num);
-        }
+        display = gdm_local_display_new ();
 
         seat_id = get_seat_of_transient_display (factory);
         g_object_set (display,
@@ -394,14 +372,12 @@ create_display (GdmLocalDisplayFactory *factory,
         g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id);
 
 
-#ifdef WITH_SYSTEMD
         if (g_strcmp0 (seat_id, "seat0") == 0) {
                 display = gdm_local_display_new ();
                 if (session_type != NULL) {
                         g_object_set (G_OBJECT (display), "session-type", session_type, NULL);
                 }
         }
-#endif
 
         if (display == NULL) {
                 guint32 num;
@@ -426,8 +402,6 @@ create_display (GdmLocalDisplayFactory *factory,
         return display;
 }
 
-#ifdef WITH_SYSTEMD
-
 static void
 delete_display (GdmLocalDisplayFactory *factory,
                 const char             *seat_id) {
@@ -564,8 +538,6 @@ gdm_local_display_factory_stop_monitor (GdmLocalDisplayFactory *factory)
         }
 }
 
-#endif
-
 static gboolean
 gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
 {
@@ -573,14 +545,8 @@ gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
 
         g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
 
-#ifdef WITH_SYSTEMD
-        if (LOGIND_RUNNING()) {
-                gdm_local_display_factory_start_monitor (factory);
-                return gdm_local_display_factory_sync_seats (factory);
-        }
-#endif
-
-        return FALSE;
+        gdm_local_display_factory_start_monitor (factory);
+        return gdm_local_display_factory_sync_seats (factory);
 }
 
 static gboolean
@@ -590,9 +556,7 @@ gdm_local_display_factory_stop (GdmDisplayFactory *base_factory)
 
         g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
 
-#ifdef WITH_SYSTEMD
         gdm_local_display_factory_stop_monitor (factory);
-#endif
 
         return TRUE;
 }
@@ -739,9 +703,7 @@ gdm_local_display_factory_finalize (GObject *object)
 
         g_hash_table_destroy (factory->priv->used_display_numbers);
 
-#ifdef WITH_SYSTEMD
         gdm_local_display_factory_stop_monitor (factory);
-#endif
 
         G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
 }