From fc033645a793cace10a3aeeeba2fbfd59cf0e121 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 23 Mar 2010 16:55:08 +0000
Subject: [PATCH] - Explicitly destroy tray icon on exit (bug #543286).

---
 hplip-tray-icon-crash.patch | 11 +++++++++++
 hplip.spec                  |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 hplip-tray-icon-crash.patch

diff --git a/hplip-tray-icon-crash.patch b/hplip-tray-icon-crash.patch
new file mode 100644
index 0000000..a603cd3
--- /dev/null
+++ b/hplip-tray-icon-crash.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.10.2/ui4/systemtray.py.tray-icon-crash hplip-3.10.2/ui4/systemtray.py
+--- hplip-3.10.2/ui4/systemtray.py.tray-icon-crash	2010-02-24 23:07:15.000000000 +0000
++++ hplip-3.10.2/ui4/systemtray.py	2010-03-23 16:42:24.476504861 +0000
+@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication):
+         log.debug("Exiting")
+         self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
+         self.quit()
++        del self.tray_icon
+ 
+ 
+     def toolboxTriggered(self):
diff --git a/hplip.spec b/hplip.spec
index cbb7d97..8943813 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,6 +19,7 @@ Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
 Patch5: hplip-device-ids.patch
 Patch6: hplip-mucks-with-spooldir.patch
+Patch7: hplip-tray-icon-crash.patch
 Patch8: hplip-retry-open.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
@@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # directly (bug #552572).
 %patch6 -p1 -b .mucks-with-spooldir
 
+# Explicitly destroy tray icon on exit (bug #543286).
+%patch7 -p1 -b .tray-icon-crash
+
 # Retry when connecting to device fails (bug #532112).
 %patch8 -p1 -b .retry-open
 
@@ -362,6 +366,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Mar 23 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-2
+- Explicitly destroy tray icon on exit (bug #543286).
+
 * Fri Feb 26 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-1
 - 3.10.2.  No longer need preferences-crash patch.
 - The pstotiff filter is rubbish so replace it (launchpad #528394).