diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-05-12 10:11:09 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2021-04-12 16:56:16 -0400 |
| commit | 98d2f24ddbc935749972bcb77eb829bcbf5bb40b (patch) | |
| tree | 942da99a2129d72c5e0c0ff6800cf9deacdeeb7c | |
| parent | 74cd3c0bbf6e984cb52e2734af5bd7a5f9f8cf13 (diff) | |
| download | gdm-98d2f24ddbc935749972bcb77eb829bcbf5bb40b.tar.gz | |
Revert "session: forward is-initial from display to worker"
This reverts commit 7a4e34049c79e907d1a027390c5d3a8dcdc11977.
It breaks login screen until reboot on 7.3→7.4 upgrade.
| -rw-r--r-- | daemon/gdm-session-worker.c | 10 | ||||
| -rw-r--r-- | daemon/gdm-session-worker.xml | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 34b3bf7f..10ecccb0 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -3060,8 +3060,7 @@ gdm_session_worker_handle_setup (GdmDBusWorker *object, const char *console, const char *seat_id, const char *hostname, - gboolean display_is_local, - gboolean display_is_initial) + gboolean display_is_local) { GdmSessionWorker *worker = GDM_SESSION_WORKER (object); validate_and_queue_state_change (worker, invocation, GDM_SESSION_WORKER_STATE_SETUP_COMPLETE); @@ -3073,7 +3072,6 @@ gdm_session_worker_handle_setup (GdmDBusWorker *object, worker->priv->display_seat_id = g_strdup (seat_id); worker->priv->hostname = g_strdup (hostname); worker->priv->display_is_local = display_is_local; - worker->priv->display_is_initial = display_is_initial; worker->priv->username = NULL; g_signal_connect_swapped (worker->priv->user_settings, @@ -3098,8 +3096,7 @@ gdm_session_worker_handle_setup_for_user (GdmDBusWorker *object, const char *console, const char *seat_id, const char *hostname, - gboolean display_is_local, - gboolean display_is_initial) + gboolean display_is_local) { GdmSessionWorker *worker = GDM_SESSION_WORKER (object); @@ -3113,7 +3110,6 @@ gdm_session_worker_handle_setup_for_user (GdmDBusWorker *object, worker->priv->display_seat_id = g_strdup (seat_id); worker->priv->hostname = g_strdup (hostname); worker->priv->display_is_local = display_is_local; - worker->priv->display_is_initial = display_is_initial; worker->priv->username = g_strdup (username); g_signal_connect_swapped (worker->priv->user_settings, @@ -3152,7 +3148,6 @@ gdm_session_worker_handle_setup_for_program (GdmDBusWorker *object, const char *seat_id, const char *hostname, gboolean display_is_local, - gboolean display_is_initial, const char *log_file) { GdmSessionWorker *worker = GDM_SESSION_WORKER (object); @@ -3165,7 +3160,6 @@ gdm_session_worker_handle_setup_for_program (GdmDBusWorker *object, worker->priv->display_seat_id = g_strdup (seat_id); worker->priv->hostname = g_strdup (hostname); worker->priv->display_is_local = display_is_local; - worker->priv->display_is_initial = display_is_initial; worker->priv->username = g_strdup (username); worker->priv->log_file = g_strdup (log_file); worker->priv->is_program_session = TRUE; diff --git a/daemon/gdm-session-worker.xml b/daemon/gdm-session-worker.xml index 4280fe09..bc055973 100644 --- a/daemon/gdm-session-worker.xml +++ b/daemon/gdm-session-worker.xml @@ -35,7 +35,6 @@ <arg name="display_seat" direction="in" type="s"/> <arg name="hostname" direction="in" type="s"/> <arg name="display_is_local" direction="in" type="b"/> - <arg name="display_is_initial" direction="in" type="b"/> </method> <method name="SetupForUser"> <arg name="service_name" direction="in" type="s"/> @@ -46,7 +45,6 @@ <arg name="display_seat" direction="in" type="s"/> <arg name="hostname" direction="in" type="s"/> <arg name="display_is_local" direction="in" type="b"/> - <arg name="display_is_initial" direction="in" type="b"/> </method> <method name="SetupForProgram"> <arg name="service_name" direction="in" type="s"/> @@ -57,7 +55,6 @@ <arg name="display_seat" direction="in" type="s"/> <arg name="hostname" direction="in" type="s"/> <arg name="display_is_local" direction="in" type="b"/> - <arg name="display_is_initial" direction="in" type="b"/> <arg name="log_file" direction="in" type="s"/> </method> <method name="StartReauthentication"> |