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
27 lines
761 B
Diff
27 lines
761 B
Diff
From 3104eac2494b041d0eca9d29ff9430512a597444 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Fri, 16 Nov 2018 10:59:30 +0100
|
|
Subject: [PATCH 1/2] ui5/systemtray.py: make children exit if no systray found
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
ui5/systemtray.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/ui5/systemtray.py b/ui5/systemtray.py
|
|
index a0cdaf1..2d6cfd2 100644
|
|
--- a/ui5/systemtray.py
|
|
+++ b/ui5/systemtray.py
|
|
@@ -848,6 +848,8 @@ def run(read_pipe):
|
|
i += 1
|
|
|
|
if not QSystemTrayIcon.isSystemTrayAvailable():
|
|
+ app.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
|
|
+ app.quit()
|
|
exit(0)
|
|
else:
|
|
notifier = QSocketNotifier(read_pipe, QSocketNotifier.Read)
|
|
--
|
|
2.19.1
|
|
|