rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Set model for LPD queue ComboEntry (bug #558484).

Browse Source
This commit is contained in:
Tim Waugh 2010-01-25 17:10:39 +00:00
parent 6574a08d3c
commit 90a2f27f88
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clog1
View File

@ -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).

24
system-config-printer-lpd-model.patch Normal file
View File

@ -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:

3
system-config-printer.spec
View File

@ -21,6 +21,7 @@ Patch3: system-config-printer-spinbuttons.patch
Patch4: system-config-printer-raw-statereason.patch Patch4: system-config-printer-raw-statereason.patch
Patch5: system-config-printer-async-fallback-2.patch Patch5: system-config-printer-async-fallback-2.patch
Patch6: system-config-printer-duplicate-current.patch Patch6: system-config-printer-duplicate-current.patch
Patch7: system-config-printer-lpd-model.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -86,6 +87,7 @@ printers.
%patch4 -p1 -b .raw-statereason %patch4 -p1 -b .raw-statereason
%patch5 -p1 -b .async-fallback-2 %patch5 -p1 -b .async-fallback-2
%patch6 -p1 -b .duplicate-current %patch6 -p1 -b .duplicate-current
%patch7 -p1 -b .lpd-model
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -202,6 +204,7 @@ exit 0
%changelog %changelog
* Mon Jan 25 2010 Tim Waugh <twaugh@redhat.com> - 1.1.90-3 * 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). - Only add current device to list when all devices found (bug #558524).
- Fixed statereason localization for raw queues (bug #558156). - Fixed statereason localization for raw queues (bug #558156).
- Fixed async fallback again (bug #557854). - Fixed async fallback again (bug #557854).