From 215d77623d827c28d8bbe971697d0c9e0f99f8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= <jpopelka@fedoraproject.org>
Date: Wed, 2 Jun 2010 16:24:18 +0000
Subject: [PATCH] - Initialise auto_make to the empty string (bug #590193).

---
 system-config-printer-auto_make.patch | 23 +++++++++++++++++++++++
 system-config-printer.spec            |  9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-auto_make.patch

diff --git a/system-config-printer-auto_make.patch b/system-config-printer-auto_make.patch
new file mode 100644
index 0000000..1930888
--- /dev/null
+++ b/system-config-printer-auto_make.patch
@@ -0,0 +1,23 @@
+diff -up system-config-printer-1.2.2/system-config-printer.py.auto_make system-config-printer-1.2.2/system-config-printer.py
+--- system-config-printer-1.2.2/system-config-printer.py.auto_make	2010-05-07 16:19:03.000000000 +0200
++++ system-config-printer-1.2.2/system-config-printer.py	2010-06-02 18:15:16.000000000 +0200
+@@ -4111,8 +4111,8 @@ class NewPrinterGUI(GtkGUI):
+             self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
+             self.rbtnChangePPDKeepSettings.set_active(True)
+ 
+-            self.auto_make = None
+-            self.auto_model = None
++            self.auto_make = ""
++            self.auto_model = ""
+             self.auto_driver = None
+             ppd = self.mainapp.ppd
+             #self.mainapp.devid = "MFG:Samsung;MDL:ML-3560;DES:;CMD:GDI;"
+@@ -4319,7 +4319,7 @@ class NewPrinterGUI(GtkGUI):
+                 self.dialog_mode == "printer_with_uri":
+             self.busy (self.NewPrinterWindow)
+             if page_nr == 1: # Device (first page)
+-                self.auto_make, self.auto_model = None, None
++                self.auto_make, self.auto_model = "", ""
+                 self.auto_driver = None
+                 self.device.uri = self.getDeviceURI()
+ 
diff --git a/system-config-printer.spec b/system-config-printer.spec
index c65ee86..afc0d6c 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-cupspk-fileget-tmp.patch
+Patch3: system-config-printer-auto_make.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,9 @@ printers.
 # (bug #587744).
 %patch2 -p1 -b .cupspk-fileget-tmp
 
+#Initialise auto_make to the empty string (bug #590193).
+%patch3 -p1 -b .auto_make
+
 %build
 %configure --with-udev-rules
 
@@ -200,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Jun 02 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.2-4
+- Initialise auto_make to the empty string (bug #590193).
+
 * Tue May 18 2010 Tim Waugh <twaugh@redhat.com> - 1.2.2-3
 - Updated pycups to 1.9.50.
 - Updated pysmbc to 1.0.7.