rpms/system-config-printer/F-11 system-config-printer-device-settings.patch, NONE, 1.1 system-config-printer.spec, 1.346, 1.347

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-device-settings.patch 
Log Message:
* Thu Feb 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-2
- Avoid clearing device settings when adding printer (bug #563989).


system-config-printer-device-settings.patch:
 system-config-printer.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-device-settings.patch ---
diff -up system-config-printer-1.1.17/system-config-printer.py.device-settings system-config-printer-1.1.17/system-config-printer.py
--- system-config-printer-1.1.17/system-config-printer.py.device-settings	2010-02-09 11:41:44.000000000 +0000
+++ system-config-printer-1.1.17/system-config-printer.py	2010-02-11 16:56:44.120583145 +0000
@@ -5312,11 +5312,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()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- system-config-printer.spec	9 Feb 2010 13:37:10 -0000	1.346
+++ system-config-printer.spec	11 Feb 2010 17:08:22 -0000	1.347
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-device-settings.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -61,6 +63,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .device-settings
 
 %build
 %configure
@@ -167,6 +170,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Feb 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-2
+- Avoid clearing device settings when adding printer (bug #563989).
+
 * Tue Feb  9 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-1
 - 1.1.17:
   - When retrying authentication as another user, forbid PolicyKit.