Accepting request 1190560 from GNOME:Factory
- Rebase gdm-restart-session-when-X-server-restart.patch. (forwarded request 1190516 from mgorse) OBS-URL: https://build.opensuse.org/request/show/1190560 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=269
This commit is contained in:
commit
f3fc859936
@ -1,8 +1,7 @@
|
|||||||
Index: gdm-45.0.1/daemon/gdm-local-display-factory.c
|
diff -urp gdm-46.2.orig/daemon/gdm-local-display-factory.c gdm-46.2/daemon/gdm-local-display-factory.c
|
||||||
===================================================================
|
--- gdm-46.2.orig/daemon/gdm-local-display-factory.c 2024-07-30 13:22:32.183596366 -0500
|
||||||
--- gdm-45.0.1.orig/daemon/gdm-local-display-factory.c
|
+++ gdm-46.2/daemon/gdm-local-display-factory.c 2024-07-30 13:43:55.948752639 -0500
|
||||||
+++ gdm-45.0.1/daemon/gdm-local-display-factory.c
|
@@ -555,11 +555,13 @@ on_display_status_changed (GdmDisplay
|
||||||
@@ -555,10 +555,12 @@ on_display_status_changed (GdmDisplay
|
|
||||||
/* if this is a local display, ensure that we get a login
|
/* if this is a local display, ensure that we get a login
|
||||||
* screen when the user logs out.
|
* screen when the user logs out.
|
||||||
*/
|
*/
|
||||||
@ -10,16 +9,16 @@ Index: gdm-45.0.1/daemon/gdm-local-display-factory.c
|
|||||||
if (is_local &&
|
if (is_local &&
|
||||||
((g_strcmp0 (session_class, "greeter") != 0 &&
|
((g_strcmp0 (session_class, "greeter") != 0 &&
|
||||||
(!seat_active_session || g_strcmp0(session_id, seat_active_session) == 0)) ||
|
(!seat_active_session || g_strcmp0(session_id, seat_active_session) == 0)) ||
|
||||||
|
#if defined(ENABLE_USER_DISPLAY_SERVER)
|
||||||
(g_strcmp0 (seat_id, "seat0") == 0 && factory->active_vt == GDM_INITIAL_VT) ||
|
(g_strcmp0 (seat_id, "seat0") == 0 && factory->active_vt == GDM_INITIAL_VT) ||
|
||||||
+ (g_strcmp0 (seat_id, "seat0") == 0 && factory->active_vt == 0) ||
|
+ (g_strcmp0 (seat_id, "seat0") == 0 && factory->active_vt == 0) ||
|
||||||
|
#endif
|
||||||
g_strcmp0 (seat_id, "seat0") != 0)) {
|
g_strcmp0 (seat_id, "seat0") != 0)) {
|
||||||
/* reset num failures */
|
/* reset num failures */
|
||||||
factory->num_failures = 0;
|
diff -urp gdm-46.2.orig/daemon/gdm-manager.c gdm-46.2/daemon/gdm-manager.c
|
||||||
Index: gdm-45.0.1/daemon/gdm-manager.c
|
--- gdm-46.2.orig/daemon/gdm-manager.c 2024-07-30 13:22:32.183596366 -0500
|
||||||
===================================================================
|
+++ gdm-46.2/daemon/gdm-manager.c 2024-07-30 13:22:55.280775612 -0500
|
||||||
--- gdm-45.0.1.orig/daemon/gdm-manager.c
|
@@ -1595,7 +1595,8 @@ on_display_status_changed (GdmDisplay *d
|
||||||
+++ gdm-45.0.1/daemon/gdm-manager.c
|
|
||||||
@@ -1552,7 +1552,8 @@ on_display_status_changed (GdmDisplay *d
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 30 18:44:44 UTC 2024 - Michael Gorse <mgorse@suse.com>
|
||||||
|
|
||||||
|
- Rebase gdm-restart-session-when-X-server-restart.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jun 19 01:15:28 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
Wed Jun 19 01:15:28 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user