rpms/system-config-printer/F-11 system-config-printer-notification-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.299, 1.300

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15843

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-notification-traceback.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid traceback in IPP notification handlers (bug #530641).


system-config-printer-notification-traceback.patch:
 system-config-printer.py |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE system-config-printer-notification-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.notification-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.notification-traceback	2009-10-30 12:36:24.901645742 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-30 12:36:34.610518996 +0000
@@ -3494,8 +3494,11 @@ class GUI(GtkGUI, monitor.Watcher):
             self.dests_iconview_selection_changed (self.dests_iconview)
             gobject.idle_add (deferred_refresh)
             if self.PrinterPropertiesDialog.get_property('visible'):
-                self.printer.getAttributes ()
-                self.updatePrinterProperties ()
+                try:
+                    self.printer.getAttributes ()
+                    self.updatePrinterProperties ()
+                except cups.IPPError:
+                    pass
 
         gtk.gdk.threads_leave ()
 
@@ -3507,8 +3510,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_added (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 
@@ -3516,8 +3522,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_removed (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- system-config-printer.spec	29 Oct 2009 17:31:49 -0000	1.299
+++ system-config-printer.spec	30 Oct 2009 12:38:29 -0000	1.300
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -29,6 +29,7 @@ Patch13: system-config-printer-strip-zxs
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
+Patch18: system-config-printer-notification-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -91,6 +92,7 @@ the configuration tool.
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
+%patch18 -p1 -b .notification-traceback
 
 %build
 %configure
@@ -192,6 +194,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid traceback in IPP notification handlers (bug #530641).
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
 - Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).