rpms/hplip/FC-6 hplip-unload-traceback.patch, NONE, 1.1 hplip.spec, 1.109, 1.110

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13345

Modified Files:
	hplip.spec 
Added Files:
	hplip-unload-traceback.patch 
Log Message:
* Thu May 10 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
- Prevent a traceback when unloading a photo card (bug #238617).
- Resolves: rhbz#238617


hplip-unload-traceback.patch:
 scrollfunc.py |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE hplip-unload-traceback.patch ---
--- hplip-1.7.2/ui/scrollfunc.py.unload-traceback	2007-05-10 12:13:17.000000000 +0100
+++ hplip-1.7.2/ui/scrollfunc.py	2007-05-10 12:13:58.000000000 +0100
@@ -176,5 +176,14 @@
         self.addControl(widget, str(title))
 
 
+    def FailureUI(self, error_text):
+        log.error(str(error_text).replace("<b>", "").replace("</b>", "").replace("<p>", ""))
+        QMessageBox.critical(self,
+                             self.caption(),
+                             error_text,
+                              QMessageBox.Ok,
+                              QMessageBox.NoButton,
+                              QMessageBox.NoButton)
+
     def __tr(self,s,c = None):
         return qApp.translate("DevMgr4",s,c)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- hplip.spec	4 May 2007 16:54:30 -0000	1.109
+++ hplip.spec	10 May 2007 11:16:06 -0000	1.110
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -22,6 +22,7 @@
 Patch7: hplip-media-empty.patch
 Patch8: hplip-marker-supply.patch
 Patch9: hplip-faxing-with-low-supplies.patch
+Patch10: hplip-unload-traceback.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -101,6 +102,9 @@
 # When faxing, low ink/paper is not a problem (bug #238664).
 %patch9 -p1 -b .faxing-with-low-supplies
 
+# Prevent a traceback when unloading a photo card (bug #238617).
+%patch10 -p1 -b .unload-traceback
+
 autoconf # for patch4
 
 %build
@@ -203,6 +207,9 @@
 exit 0
 
 %changelog
+* Thu May 10 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
+- Prevent a traceback when unloading a photo card (bug #238617).
+
 * Fri May  4 2007 Tim Waugh <twaugh at redhat.com>
 - When faxing, low ink/paper is not a problem (bug #238664).