diff options
| author | Ray Strode <rstrode@redhat.com> | 2018-09-01 07:05:45 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2018-09-01 07:05:45 -0400 |
| commit | e8f11816a30fa281a6a22ea8d635c64679cb81bd (patch) | |
| tree | f3ef265a7c06f135e34dba1905372fe5d8bd3165 /daemon/gdm-manager.c | |
| parent | 92784a84740f5be3804757b4664352be35418a78 (diff) | |
| download | gdm-e8f11816a30fa281a6a22ea8d635c64679cb81bd.tar.gz | |
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.
Diffstat (limited to 'daemon/gdm-manager.c')
| -rw-r--r-- | daemon/gdm-manager.c | 4 |
1 files 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); |