- Avoid clearing device settings when adding printer (bug #563989).

This commit is contained in:
Tim Waugh 2010-02-11 17:29:59 +00:00
parent 660da2d3d0
commit 8d060252b2
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,19 @@
diff -up system-config-printer-1.1.91/system-config-printer.py.device-settings system-config-printer-1.1.91/system-config-printer.py
--- system-config-printer-1.1.91/system-config-printer.py.device-settings 2010-02-08 17:31:21.000000000 +0000
+++ system-config-printer-1.1.91/system-config-printer.py 2010-02-11 17:18:45.101708282 +0000
@@ -5049,11 +5049,13 @@ class NewPrinterGUI(GtkGUI):
iter = model.iter_next (iter)
i += 1
elif not self.device_selected:
+ # Select the device.
column = self.tvNPDevices.get_column (0)
self.tvNPDevices.set_cursor ((0,), column)
- column = self.tvNPDeviceURIs.get_column (0)
- self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
+ # Select the connection.
+ column = self.tvNPDeviceURIs.get_column (0)
+ self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
def on_entNPTDevice_changed(self, entry):
self.setNPButtons()

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.1.91 Version: 1.1.91
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-no-epydoc.patch Patch1: system-config-printer-no-epydoc.patch
Patch2: system-config-printer-device-settings.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -75,6 +76,7 @@ printers.
%prep %prep
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch1 -p1 -b .no-epydoc %patch1 -p1 -b .no-epydoc
%patch2 -p1 -b .device-settings
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -190,6 +192,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Thu Feb 11 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-2
- Avoid clearing device settings when adding printer (bug #563989).
* Mon Feb 8 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-1 * Mon Feb 8 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-1
- 1.1.91. - 1.1.91.
- No longer requires usermode (bug #562270). - No longer requires usermode (bug #562270).