rpms/system-config-printer/devel system-config-printer-lpd-model.patch, NONE, 1.1 system-config-printer.spec, 1.353, 1.354 clog1, 1.7, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2863

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-lpd-model.patch 
Removed Files:
	clog1 
Log Message:
* Mon Jan 25 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-3
- Set model for LPD queue ComboEntry (bug #558484).


system-config-printer-lpd-model.patch:
 system-config-printer.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-lpd-model.patch ---
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:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -p -r1.353 -r1.354
--- system-config-printer.spec	25 Jan 2010 16:28:00 -0000	1.353
+++ system-config-printer.spec	25 Jan 2010 17:10:39 -0000	1.354
@@ -21,6 +21,7 @@ Patch3: system-config-printer-spinbutton
 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 at 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).


--- clog1 DELETED ---