rpms/system-config-printer/F-11 system-config-printer-cancel-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.288, 1.289

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cancel-traceback.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed traceback when cancelling change-driver dialog.


system-config-printer-cancel-traceback.patch:
 system-config-printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-cancel-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.cancel-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.cancel-traceback	2009-09-18 13:10:10.962438215 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:10:20.041314240 +0100
@@ -3805,6 +3805,7 @@ class NewPrinterGUI(GtkGUI):
         self.options = {} # keyword -> Option object
         self.changed = set()
         self.conflicts = set()
+        self.fetchDevices_op = None
 
         combobox = self.cmbNPDownloadableDriverFoundPrinters
         combobox.set_model (gtk.ListStore (str, str))


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- system-config-printer.spec	22 Sep 2009 10:09:06 -0000	1.288
+++ system-config-printer.spec	22 Sep 2009 10:18:28 -0000	1.289
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-data-button-state.patch
+Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
 
@@ -67,6 +68,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
+%patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
 
@@ -171,6 +173,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).