rpms/hplip/F-13 hplip-tray-icon-crash.patch, NONE, 1.1 hplip.spec, 1.264, 1.265

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9895

Modified Files:
	hplip.spec 
Added Files:
	hplip-tray-icon-crash.patch 
Log Message:
* Tue Mar 23 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-5
- Explicitly destroy tray icon on exit (bug #543286).


hplip-tray-icon-crash.patch:
 systemtray.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE hplip-tray-icon-crash.patch ---
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):


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/hplip.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- hplip.spec	4 Mar 2010 09:30:01 -0000	1.264
+++ hplip.spec	23 Mar 2010 17:16:03 -0000	1.265
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -21,6 +21,7 @@ Patch5: hplip-device-ids.patch
 Patch6: hplip-mucks-with-spooldir.patch
 Patch7: hplip-udev-rules.patch
 Patch8: hplip-retry-open.patch
+Patch9: hplip-tray-icon-crash.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Retry when connecting to device fails (bug #532112).
 %patch8 -p1 -b .retry-open
 
+# Explicitly destroy tray icon on exit (bug #543286).
+%patch9 -p1 -b .tray-icon-crash
+
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
@@ -368,6 +372,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Mar 23 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-5
+- Explicitly destroy tray icon on exit (bug #543286).
+
 * Thu Mar  4 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-4
 - Main package doesn't require hal.
 - Sub-package common requires udev.