345f52c428
- Fix hang during GNOME session logout (bsc#1112331, lp#1721534) * added ui5-systemtray.py-make-children-exit-if-no-systray-f.patch * added ui5-systemtray-wait-only-10s-for-system-tray.patch OBS-URL: https://build.opensuse.org/request/show/672868 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=163
30 lines
863 B
Diff
30 lines
863 B
Diff
From 1b6030a6b94731c06f3dcc04bec88bf63af85f61 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Fri, 16 Nov 2018 11:00:44 +0100
|
|
Subject: [PATCH 2/2] ui5/systemtray: wait only 10s for system tray
|
|
|
|
On GNOME >= 3.26, it will never show up. This may cause hangs on
|
|
logout if users log in and log out quickly again.
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
ui5/systemtray.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ui5/systemtray.py b/ui5/systemtray.py
|
|
index 2d6cfd2..c71375b 100644
|
|
--- a/ui5/systemtray.py
|
|
+++ b/ui5/systemtray.py
|
|
@@ -841,7 +841,7 @@ def run(read_pipe):
|
|
app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
|
|
|
|
i = 0
|
|
- while i < 60:
|
|
+ while i < 10:
|
|
if QSystemTrayIcon.isSystemTrayAvailable():
|
|
break
|
|
time.sleep(1.0)
|
|
--
|
|
2.19.1
|
|
|