SHA256
1
0
forked from pool/gdm
gdm/gdm-restart-session-when-X-server-restart.patch
Dominique Leuenberger f4387cc926 Accepting request 1073111 from GNOME:Next
Subbing RC in case upstream forget to do a stable bump
- Update to version 44.rc:
  + Lots of code clean ups.
  + Fix detection of virt on efi setups.
  + Fix btmp accounting on failed logins.
  + Ensure pam_close_session is called even if worker is killed.
  + Updated translations.
- Drop gdm-switch-user-tty7.patch: fixed upstream.
- Refresh patches with Quilt.
- Rebase gdm-xauthlocalhostname.patch due to code clean up commit:
  88d79fe24cda8623a4b460c0aa9628178c26f745.

OBS-URL: https://build.opensuse.org/request/show/1073111
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=515
2023-03-20 12:50:07 +00:00

27 lines
1.4 KiB
Diff

--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -552,8 +552,10 @@ on_display_status_changed (GdmDisplay
* ensures we get a new login screen when the user logs out,
* if there isn't one.
*/
+ g_debug ("GdmLocalDisplayFactory: session_class = %s active_vt = %u", session_class, factory->active_vt);
if (is_local &&
- (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT)) {
+ (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT
+ || factory->active_vt == 0)) {
/* reset num failures */
factory->num_failures = 0;
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1553,7 +1553,8 @@ on_display_status_changed (GdmDisplay *d
}
#endif
- g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL);
+ if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL )
+ g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL);
if (display == manager->automatic_login_display) {
g_clear_weak_pointer (&manager->automatic_login_display);