From edba4448513eacf592f69c8f93d30ef62ccb107a Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 23 Jun 2009 11:30:57 +0000
Subject: [PATCH] - Fixed traceback when adding/modifying printer which could
 lead to display     bugs (bug #507489).

---
 system-config-printer-bug507489.patch | 15 +++++++++++++++
 system-config-printer.spec            |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-bug507489.patch

diff --git a/system-config-printer-bug507489.patch b/system-config-printer-bug507489.patch
new file mode 100644
index 0000000..29e8121
--- /dev/null
+++ b/system-config-printer-bug507489.patch
@@ -0,0 +1,15 @@
+diff -up system-config-printer-1.1.8/system-config-printer.py.bug507489 system-config-printer-1.1.8/system-config-printer.py
+--- system-config-printer-1.1.8/system-config-printer.py.bug507489	2009-06-17 18:39:51.000000000 +0100
++++ system-config-printer-1.1.8/system-config-printer.py	2009-06-23 12:23:49.888572438 +0100
+@@ -6644,6 +6644,11 @@ class NewPrinterGUI(GtkGUI):
+ 
+             iter = model.iter_next (iter)
+ 
++        # Load information about the printer,
++        # e.g. self.mainapp.server_side_options and self.mainapp.ppd
++        # (both used below).
++        self.mainapp.fillPrinterTab (name)
++
+         if check:
+             try:
+                 self.checkDriverExists (name, ppd=checkppd)
diff --git a/system-config-printer.spec b/system-config-printer.spec
index a9772fa..9a7f329 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-bug507489.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -63,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .bug507489
 
 %build
 %configure
@@ -165,6 +167,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Jun 23 2009 Tim Waugh <twaugh@redhat.com> 1.1.8-2
+- Fixed traceback when adding/modifying printer which could lead to
+  display bugs (bug #507489).
+
 * Thu Jun 18 2009 Tim Waugh <twaugh@redhat.com> 1.1.8-1
 - Updated pycups to 1.9.46.
 - Updated to 1.1.8: