From ca81e4fa4bf0680079e8de7ef83e9c20160723d3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:42:58 +0100
Subject: [PATCH] fix ui5-systray-hide-when-inactive patch [release
 3.22.4-2mamba;Mon Jun 20 2022]

---
 ....22.4-ui5-systray-hide-when-inactive.patch | 19 +++++++++++++++++--
 hplip.spec                                    |  5 ++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/hplip-3.22.4-ui5-systray-hide-when-inactive.patch b/hplip-3.22.4-ui5-systray-hide-when-inactive.patch
index 2651c6b..ae7f7dd 100644
--- a/hplip-3.22.4-ui5-systray-hide-when-inactive.patch
+++ b/hplip-3.22.4-ui5-systray-hide-when-inactive.patch
@@ -1,5 +1,6 @@
---- hplip-3.20.11/ui5/ui_utils.py.orig	2020-12-13 11:57:56.371789774 +0100
-+++ hplip-3.20.11/ui5/ui_utils.py	2020-12-13 11:58:44.127640113 +0100
+diff -Nru hplip-3.22.4/ui5/ui_utils.py hplip-3.22.4.patched/ui5/ui_utils.py
+--- hplip-3.22.4/ui5/ui_utils.py        2022-04-26 06:17:00.000000000 +0200
++++ hplip-3.22.4.patched/ui5/ui_utils.py        2022-06-20 10:08:24.597882779 +0200
 @@ -173,7 +173,7 @@
          else:
              QSettings.__init__(self, os.path.join(prop.user_dir,  'hplip.conf'),  QSettings.IniFormat)
@@ -9,3 +10,17 @@
          self.systray_messages = SYSTRAY_MESSAGES_SHOW_ALL
          self.last_used_device_uri = ''
          self.last_used_printer = ''
+@@ -214,8 +214,11 @@
+         self.sync()
+ 
+         self.beginGroup("settings")
+-        self.systray_visible = value_int(self.value("systray_visible"))[0]
+-        
++        if self.value("systray_visible") is not None:
++            self.systray_visible = value_int(self.value("systray_visible"))[0]
++        else:
++            self.systray_visible = SYSTRAY_VISIBLE_HIDE_WHEN_INACTIVE
++
+         self.systray_messages = value_int(self.value("systray_messages"))[0]
+  
+         self.endGroup()
diff --git a/hplip.spec b/hplip.spec
index c6ea87f..fe01113 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -3,7 +3,7 @@
 %define cups_ver %(cups-config --api-version)
 Name:          hplip
 Version:       3.22.4
-Release:       1mamba
+Release:       2mamba
 Summary:       A printer driver for HP inkjet devices
 Group:         System/Spooling
 Vendor:        openmamba
@@ -286,6 +286,9 @@ fi
 %{_localstatedir}/lib/hp/hplip.state
 
 %changelog
+* Mon Jun 20 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.22.4-2mamba
+- fix ui5-systray-hide-when-inactive patch
+
 * Sat May 21 2022 Automatic Build System <autodist@mambasoft.it> 3.22.4-1mamba
 - automatic version update by autodist