From 90a2f27f88ffa47fb936598ebd4cda1b2a991fb5 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 25 Jan 2010 17:10:39 +0000
Subject: [PATCH] - Set model for LPD queue ComboEntry (bug #558484).

---
 clog1                                 |  2 --
 system-config-printer-lpd-model.patch | 24 ++++++++++++++++++++++++
 system-config-printer.spec            |  3 +++
 3 files changed, 27 insertions(+), 2 deletions(-)
 delete mode 100644 clog1
 create mode 100644 system-config-printer-lpd-model.patch

diff --git a/clog1 b/clog1
deleted file mode 100644
index 86aeabe..0000000
--- a/clog1
+++ /dev/null
@@ -1,2 +0,0 @@
-* Mon Jan 25 2010 Tim Waugh <twaugh@redhat.com> - 1.1.90-3
-- Only add current device to list when all devices found (bug #558524).
diff --git a/system-config-printer-lpd-model.patch b/system-config-printer-lpd-model.patch
new file mode 100644
index 0000000..52717bc
--- /dev/null
+++ b/system-config-printer-lpd-model.patch
@@ -0,0 +1,24 @@
+diff -up system-config-printer-1.1.90/system-config-printer.py.lpd-model system-config-printer-1.1.90/system-config-printer.py
+--- system-config-printer-1.1.90/system-config-printer.py.lpd-model	2010-01-25 16:31:03.394084803 +0000
++++ system-config-printer-1.1.90/system-config-printer.py	2010-01-25 16:31:36.473209434 +0000
+@@ -5729,7 +5729,8 @@ class NewPrinterGUI(GtkGUI):
+         elif device.type=="lpd":
+             self.cmbentNPTLpdHost.child.set_text ('')
+             self.cmbentNPTLpdQueue.child.set_text ('')
+-            self.cmbentNPTLpdQueue.get_model().clear ()
++            model = gtk.ListStore (gobject.TYPE_STRING)
++            self.cmbentNPTLpdQueue.set_model(model)
+             self.btnNPTLpdProbe.set_sensitive (False)
+             if len (device.uri) > 6:
+                 host = device.uri[6:]
+@@ -5790,8 +5791,8 @@ class NewPrinterGUI(GtkGUI):
+         printers = server.probe()
+         self.WaitWindow.hide ()
+ 
+-        model = self.cmbentNPTLpdQueue.get_model()
+-        model.clear()
++        model = gtk.ListStore (gobject.TYPE_STRING)
++        self.cmbentNPTLpdQueue.set_model (model)
+         for printer in printers:
+             self.cmbentNPTLpdQueue.append_text(printer)
+         if printers:
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 5b3856d..5ee13e3 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -21,6 +21,7 @@ Patch3: system-config-printer-spinbuttons.patch
 Patch4: system-config-printer-raw-statereason.patch
 Patch5: system-config-printer-async-fallback-2.patch
 Patch6: system-config-printer-duplicate-current.patch
+Patch7: system-config-printer-lpd-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -86,6 +87,7 @@ printers.
 %patch4 -p1 -b .raw-statereason
 %patch5 -p1 -b .async-fallback-2
 %patch6 -p1 -b .duplicate-current
+%patch7 -p1 -b .lpd-model
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -202,6 +204,7 @@ exit 0
 
 %changelog
 * Mon Jan 25 2010 Tim Waugh <twaugh@redhat.com> - 1.1.90-3
+- Set model for LPD queue ComboEntry (bug #558484).
 - Only add current device to list when all devices found (bug #558524).
 - Fixed statereason localization for raw queues (bug #558156).
 - Fixed async fallback again (bug #557854).