pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 956510 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/956510
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=200
This commit is contained in:
Dominique Leuenberger 2022-02-22 20:17:52 +00:00 committed by Git OBS Bridge
commit 41467e063a
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnome-session-exit-when-lost-name-on-bus.patch Normal file
View File

@ -0,0 +1,40 @@
Index: gnome-session-41.3/gnome-session/gsm-manager.c
===================================================================
--- gnome-session-41.3.orig/gnome-session/gsm-manager.c
+++ gnome-session-41.3/gnome-session/gsm-manager.c
@@ -1850,6 +1850,16 @@ gsm_manager_set_failsafe (GsmManager *ma
}
gboolean
+gsm_manager_get_dbus_disconnected (GsmManager *manager)
+{
+ GsmManagerPrivate *priv = gsm_manager_get_instance_private (manager);
+
+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
+
+ return priv->dbus_disconnected;
+}
+
+gboolean
gsm_manager_get_failsafe (GsmManager *manager)
{
GsmManagerPrivate *priv = gsm_manager_get_instance_private (manager);
Index: gnome-session-41.3/gnome-session/main.c
===================================================================
--- gnome-session-41.3.orig/gnome-session/main.c
+++ gnome-session-41.3/gnome-session/main.c
@@ -83,8 +83,12 @@ on_name_lost (GDBusConnection *connectio
gpointer data)
{
if (connection == NULL) {
- g_warning ("Lost name on bus: %s", name);
- gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
+ if (gsm_manager_get_dbus_disconnected (manager))
+ gsm_quit ();
+ else {
+ g_warning ("Lost name on bus: %s", name);
+ gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
+ }
} else {
g_debug ("Calling name lost callback function");

7
gnome-session.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 21 02:19:03 UTC 2022 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Add back gnome-session-exit-when-lost-name-on-bus.patch:
gnome-session exit immediately when lost name on bus
(bsc#1175622 glgo!GNOME/gnome-session!60, bsc#1188882).
-------------------------------------------------------------------
Wed Jan 12 17:03:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

3
gnome-session.spec
View File

@ -30,6 +30,8 @@ Source2: gnome.desktop
Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
# PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch
# PATCH-FIX-UPSTREAM gnome-session-exit-when-lost-name-on-bus.patch bsc#1175622 glgo!GNOME/gnome-session!60 xwang@suse.com -- gnome-session exit immediately when lost name on bus
Patch3: gnome-session-exit-when-lost-name-on-bus.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -107,6 +109,7 @@ functional GNOME desktop.
%ifarch s390 s390x
%patch2 -p1
%endif
%patch3 -p1
%build
%meson \