diff options
| author | Ray Strode <halfline@gmail.com> | 2020-07-24 19:17:34 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2020-07-24 19:17:34 +0000 |
| commit | cf0155acf8e19fdc3592977f232c2a683ec60398 (patch) | |
| tree | 08c9ceded426231dfe07a6f56e808c5444df5a9b | |
| parent | 96ff4aa25f735fea1ca5010d26d51a4a7ce89825 (diff) | |
| parent | 0dbf4e750dcf22ed6cb3568ed88b1c0059a1e2ef (diff) | |
| download | gdm-cf0155acf8e19fdc3592977f232c2a683ec60398.tar.gz | |
Merge branch 'wip/killing-x-doesnt-need-wayland' into 'master'
local-display-factory: again don't require wayland support to kill X
Closes #614
See merge request GNOME/gdm!104
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index 6dbdc6ed..e7cafeb1 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -63,7 +63,7 @@ struct _GdmLocalDisplayFactory guint seat_new_id; guint seat_removed_id; -#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER) +#if defined(ENABLE_USER_DISPLAY_SERVER) unsigned int active_vt; guint active_vt_watch_id; guint wait_to_finish_timeout_id; @@ -406,7 +406,7 @@ on_display_status_changed (GdmDisplay *display, case GDM_DISPLAY_PREPARED: break; case GDM_DISPLAY_MANAGED: -#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER) +#if defined(ENABLE_USER_DISPLAY_SERVER) g_signal_connect_object (display, "notify::session-registered", G_CALLBACK (on_session_registered_cb), @@ -867,7 +867,7 @@ gdm_local_display_factory_start_monitor (GdmLocalDisplayFactory *factory) g_object_ref (factory), g_object_unref); -#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER) +#if defined(ENABLE_USER_DISPLAY_SERVER) io_channel = g_io_channel_new_file ("/sys/class/tty/tty0/active", "r", NULL); if (io_channel != NULL) { @@ -894,7 +894,7 @@ gdm_local_display_factory_stop_monitor (GdmLocalDisplayFactory *factory) factory->seat_removed_id); factory->seat_removed_id = 0; } -#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER) +#if defined(ENABLE_USER_DISPLAY_SERVER) if (factory->active_vt_watch_id) { g_source_remove (factory->active_vt_watch_id); factory->active_vt_watch_id = 0; |