Fixed new printer dialog traceback (bug #969916).

This commit is contained in:
Tim Waugh 2013-06-07 12:42:07 +01:00
parent 3fa4f482d5
commit 7c67764aaa
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,21 @@
diff -up system-config-printer-1.4.1/newprinter.py.np-traceback system-config-printer-1.4.1/newprinter.py
--- system-config-printer-1.4.1/newprinter.py.np-traceback 2013-06-07 12:40:22.819125802 +0100
+++ system-config-printer-1.4.1/newprinter.py 2013-06-07 12:40:35.549191403 +0100
@@ -868,7 +868,7 @@ class NewPrinterGUI(GtkGUI):
if self.ppdsloader:
self.ppdsloader.destroy ()
- self.ppds_loader = None
+ self.ppdsloader = None
if self.printer_finder:
self.printer_finder.cancel ()
@@ -3418,7 +3418,7 @@ class NewPrinterGUI(GtkGUI):
def on_tvNPMakes_cursor_changed(self, tvNPMakes):
path, column = tvNPMakes.get_cursor()
- if path != None:
+ if path != None and self.ppds != None:
model = tvNPMakes.get_model ()
iter = model.get_iter (path)
self.NPMake = model.get(iter, 1)[0]

View File

@ -18,6 +18,7 @@ Patch9: system-config-printer-utf8-971548.patch
Patch10: system-config-printer-typo.patch Patch10: system-config-printer-typo.patch
Patch11: system-config-printer-notify-urgency.patch Patch11: system-config-printer-notify-urgency.patch
Patch12: system-config-printer-pointer-grab.patch Patch12: system-config-printer-pointer-grab.patch
Patch13: system-config-printer-np-traceback.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
@ -101,6 +102,9 @@ printers.
# works (bug #971459). # works (bug #971459).
%patch12 -p1 -b .pointer-grab %patch12 -p1 -b .pointer-grab
# Fixed new printer dialog traceback (bug #969916).
%patch13 -p1 -b .np-traceback
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -200,6 +204,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0 exit 0
%changelog %changelog
* Fri Jun 7 2013 Tim Waugh <twaugh@redhat.com>
- Fixed new printer dialog traceback (bug #969916).
* Fri Jun 7 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-5 * Fri Jun 7 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-5
- More fixes for UTF-8 encoding issues (bug #971548). - More fixes for UTF-8 encoding issues (bug #971548).