From e8f11816a30fa281a6a22ea8d635c64679cb81bd Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 1 Sep 2018 07:05:45 -0400 Subject: manager: fix build with --without-plymouth commit 80b46e2 accidentally put the `doing_initial_setup` boolean declaration inside a plymouth-enabled code path. That broke the build for non-plymouth users. This commit moves the declaration and the subsequent initialization to unconditionalized code. --- daemon/gdm-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 986891bb..20a9ba7d 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -1433,14 +1433,13 @@ on_display_status_changed (GdmDisplay *display, int status; int display_number = -1; char *session_type = NULL; + gboolean doing_initial_setup = FALSE; #ifdef WITH_PLYMOUTH gboolean display_is_local = FALSE; - gboolean doing_initial_setup = FALSE; gboolean quit_plymouth = FALSE; g_object_get (display, "is-local", &display_is_local, - "doing-initial-setup", &doing_initial_setup, NULL); quit_plymouth = display_is_local && manager->priv->plymouth_is_running; #endif @@ -1448,6 +1447,7 @@ on_display_status_changed (GdmDisplay *display, g_object_get (display, "x11-display-number", &display_number, "session-type", &session_type, + "doing-initial-setup", &doing_initial_setup, NULL); status = gdm_display_get_status (display); -- cgit v1.2.1 From d86a80ea2e9dcfa8fe90d43cf558f5297331c821 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 1 Sep 2018 07:08:56 -0400 Subject: 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 --- daemon/gdm-local-display-factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.1