rpms/system-config-printer/F-11 system-config-printer-test-page-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.301, 1.302

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-test-page-traceback.patch 
Log Message:
* Thu Nov  5 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-8
- Fail gracefully if the new printer has disappeared before the user
  has responded to the test page prompt (bug #533109).


system-config-printer-test-page-traceback.patch:
 system-config-printer.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-test-page-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.test-page-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.test-page-traceback	2009-11-05 10:47:05.292253962 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-11-05 10:47:14.494130755 +0000
@@ -6825,12 +6825,19 @@ class NewPrinterGUI(GtkGUI):
             response = q.run ()
             q.destroy ()
             if response == gtk.RESPONSE_YES:
-                # Load the printer details but hide the properties dialog.
-                self.mainapp.display_properties_dialog_for (name)
                 self.mainapp.PrinterPropertiesDialog.hide ()
 
-                # Click the test button.
-                self.mainapp.btnPrintTestPage.clicked ()
+                properties_shown = False
+                try:
+                    # Load the printer details but hide the properties dialog.
+                    self.mainapp.display_properties_dialog_for (name)
+                    properties_shown = True
+                except RuntimeError:
+                    pass
+
+                if properties_shown:
+                    # Click the test button.
+                    self.mainapp.btnPrintTestPage.clicked ()
 
     def checkDriverExists(self, name, ppd=None):
         """Check that the driver for an existing queue actually


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- system-config-printer.spec	2 Nov 2009 13:09:11 -0000	1.301
+++ system-config-printer.spec	5 Nov 2009 10:52:45 -0000	1.302
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -31,6 +31,7 @@ Patch15: system-config-printer-strip-zjs
 Patch16: system-config-printer-custom-state-reasons.patch
 Patch18: system-config-printer-notification-traceback.patch
 Patch19: system-config-printer-de.po-typo.patch
+Patch20: system-config-printer-test-page-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -95,6 +96,7 @@ the configuration tool.
 %patch16 -p1 -b .custom-state-reasons
 %patch18 -p1 -b .notification-traceback
 %patch19 -p1 -b .de.po-typo
+%patch20 -p1 -b .test-page-traceback
 
 %build
 %configure
@@ -196,6 +198,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Nov  5 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-8
+- Fail gracefully if the new printer has disappeared before the user
+  has responded to the test page prompt (bug #533109).
+
 * Mon Nov  2 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-7
 - Fixed typo in de.po (bug #532371).