From 7c67764aaaeb886c916545193149607fdd4c6a56 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 7 Jun 2013 12:42:07 +0100
Subject: [PATCH] Fixed new printer dialog traceback (bug #969916).

---
 system-config-printer-np-traceback.patch | 21 +++++++++++++++++++++
 system-config-printer.spec               |  7 +++++++
 2 files changed, 28 insertions(+)
 create mode 100644 system-config-printer-np-traceback.patch

diff --git a/system-config-printer-np-traceback.patch b/system-config-printer-np-traceback.patch
new file mode 100644
index 0000000..5caf97b
--- /dev/null
+++ b/system-config-printer-np-traceback.patch
@@ -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]
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 28465ef..873f4ef 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -18,6 +18,7 @@ Patch9: system-config-printer-utf8-971548.patch
 Patch10: system-config-printer-typo.patch
 Patch11: system-config-printer-notify-urgency.patch
 Patch12: system-config-printer-pointer-grab.patch
+Patch13: system-config-printer-np-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -101,6 +102,9 @@ printers.
 # works (bug #971459).
 %patch12 -p1 -b .pointer-grab
 
+# Fixed new printer dialog traceback (bug #969916).
+%patch13 -p1 -b .np-traceback
+
 %build
 %configure --with-udev-rules
 
@@ -200,6 +204,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %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
 - More fixes for UTF-8 encoding issues (bug #971548).