SHA256
1
0
forked from pool/gdm
gdm/gdm-restart-session-when-X-server-restart.patch
Dominique Leuenberger b8cf289df8 Accepting request 962025 from home:xiaoguang_wang:branches:GNOME:Factory
- Add gdm-restart-session-when-X-server-restart.patch:
  Avoiding the blank screen when X server restarts with
  GDM_DISABLE_USER_DISPLAY_SERVER=1 (bsc#1196974).

OBS-URL: https://build.opensuse.org/request/show/962025
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=494
2022-03-21 09:04:49 +00:00

31 lines
1.6 KiB
Diff

Index: gdm-41.3/daemon/gdm-local-display-factory.c
===================================================================
--- gdm-41.3.orig/daemon/gdm-local-display-factory.c
+++ gdm-41.3/daemon/gdm-local-display-factory.c
@@ -541,8 +541,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;
Index: gdm-41.3/daemon/gdm-manager.c
===================================================================
--- gdm-41.3.orig/daemon/gdm-manager.c
+++ gdm-41.3/daemon/gdm-manager.c
@@ -1548,7 +1548,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->priv->automatic_login_display) {
g_clear_weak_pointer (&manager->priv->automatic_login_display);