diff options
| author | Ray Strode <halfline@gmail.com> | 2018-09-01 11:18:43 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2018-09-01 11:18:43 +0000 |
| commit | cb16727cb41c9e492583f2307b93bb4e7bf14e7f (patch) | |
| tree | fac2a8f453a6ffa7eeaed542e66381861bbc08e9 | |
| parent | 92784a84740f5be3804757b4664352be35418a78 (diff) | |
| parent | d86a80ea2e9dcfa8fe90d43cf558f5297331c821 (diff) | |
| download | gdm-cb16727cb41c9e492583f2307b93bb4e7bf14e7f.tar.gz | |
Merge branch 'BUILD-FIXES-EEK' into 'master'
Build fixes eek
Closes #416
See merge request GNOME/gdm!43
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 2 | ||||
| -rw-r--r-- | daemon/gdm-manager.c | 4 |
2 files changed, 3 insertions, 3 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) { 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); |