summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-09-01 07:08:56 -0400
committerRay Strode <rstrode@redhat.com>2018-09-01 07:12:07 -0400
commitd86a80ea2e9dcfa8fe90d43cf558f5297331c821 (patch)
treefac2a8f453a6ffa7eeaed542e66381861bbc08e9
parente8f11816a30fa281a6a22ea8d635c64679cb81bd (diff)
downloadgdm-d86a80ea2e9dcfa8fe90d43cf558f5297331c821.tar.gz
local-display-factory: fix build with --disable-user-display-server
commit cf8d918f added a call to `lookup_by_session` which was previously only defined when built GDM was built with `--enable-user-disable-server`. That causes the build to fail with `--disable-user-display-server`. This commit fixes the build by moving `lookup_by_session` out of conditionalized code. Closes https://gitlab.gnome.org/GNOME/gdm/issues/416
-rw-r--r--daemon/gdm-local-display-factory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 5ec94ce7..b0b818e5 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -602,7 +602,6 @@ on_seat_removed (GDBusConnection *connection,
delete_display (GDM_LOCAL_DISPLAY_FACTORY (user_data), seat);
}
-#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
static gboolean
lookup_by_session_id (const char *id,
GdmDisplay *display,
@@ -615,6 +614,7 @@ lookup_by_session_id (const char *id,
return g_strcmp0 (current, looking_for) == 0;
}
+#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
static void
maybe_stop_greeter_in_background (GdmDisplay *display)
{