Commit cb16727c authored by Ray Strode's avatar Ray Strode

Merge branch 'BUILD-FIXES-EEK' into 'master'

Build fixes eek

Closes #416

See merge request !43
parents 92784a84 d86a80ea
Pipeline #27975 passed with stage
in 5 minutes and 18 seconds
...@@ -602,7 +602,6 @@ on_seat_removed (GDBusConnection *connection, ...@@ -602,7 +602,6 @@ on_seat_removed (GDBusConnection *connection,
delete_display (GDM_LOCAL_DISPLAY_FACTORY (user_data), seat); delete_display (GDM_LOCAL_DISPLAY_FACTORY (user_data), seat);
} }
#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
static gboolean static gboolean
lookup_by_session_id (const char *id, lookup_by_session_id (const char *id,
GdmDisplay *display, GdmDisplay *display,
...@@ -615,6 +614,7 @@ lookup_by_session_id (const char *id, ...@@ -615,6 +614,7 @@ lookup_by_session_id (const char *id,
return g_strcmp0 (current, looking_for) == 0; return g_strcmp0 (current, looking_for) == 0;
} }
#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
static void static void
maybe_stop_greeter_in_background (GdmDisplay *display) maybe_stop_greeter_in_background (GdmDisplay *display)
{ {
......
...@@ -1433,14 +1433,13 @@ on_display_status_changed (GdmDisplay *display, ...@@ -1433,14 +1433,13 @@ on_display_status_changed (GdmDisplay *display,
int status; int status;
int display_number = -1; int display_number = -1;
char *session_type = NULL; char *session_type = NULL;
gboolean doing_initial_setup = FALSE;
#ifdef WITH_PLYMOUTH #ifdef WITH_PLYMOUTH
gboolean display_is_local = FALSE; gboolean display_is_local = FALSE;
gboolean doing_initial_setup = FALSE;
gboolean quit_plymouth = FALSE; gboolean quit_plymouth = FALSE;
g_object_get (display, g_object_get (display,
"is-local", &display_is_local, "is-local", &display_is_local,
"doing-initial-setup", &doing_initial_setup,
NULL); NULL);
quit_plymouth = display_is_local && manager->priv->plymouth_is_running; quit_plymouth = display_is_local && manager->priv->plymouth_is_running;
#endif #endif
...@@ -1448,6 +1447,7 @@ on_display_status_changed (GdmDisplay *display, ...@@ -1448,6 +1447,7 @@ on_display_status_changed (GdmDisplay *display,
g_object_get (display, g_object_get (display,
"x11-display-number", &display_number, "x11-display-number", &display_number,
"session-type", &session_type, "session-type", &session_type,
"doing-initial-setup", &doing_initial_setup,
NULL); NULL);
status = gdm_display_get_status (display); status = gdm_display_get_status (display);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment