rpms/hplip/devel hplip-unload-traceback.patch, NONE, 1.1 hplip.spec, 1.126, 1.127

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18700

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-10
- Prevent a traceback when unloading a photo card (bug #238617).


hplip-unload-traceback.patch:

--- 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/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- hplip.spec	4 May 2007 16:42:29 -0000	1.126
+++ hplip.spec	10 May 2007 11:37:26 -0000	1.127
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -23,6 +23,7 @@
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
 Patch10: hplip-faxing-with-low-supplies.patch
+Patch11: hplip-unload-traceback.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires(post): /sbin/service
@@ -112,6 +113,9 @@
 # When faxing, low ink/paper is not a problem (bug #238664).
 %patch10 -p1 -b .faxing-with-low-supplies
 
+# Prevent a traceback when unloading a photo card (bug #238617).
+%patch11 -p1 -b .unload-traceback
+
 autoconf # for patch4
 
 %build
@@ -287,6 +291,9 @@
 exit 0
 
 %changelog
+* Thu May 10 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-10
+- Prevent a traceback when unloading a photo card (bug #238617).
+
 * Fri May  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-9
 - When faxing, low ink/paper is not a problem (bug #238664).