rpms/system-config-printer/F-11 system-config-printer-browsepoll.patch, NONE, 1.1 system-config-printer.spec, 1.309, 1.310

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-browsepoll.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).


system-config-printer-browsepoll.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-browsepoll.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.browsepoll system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.browsepoll	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-03 17:09:32.221925957 +0000
@@ -3379,7 +3379,7 @@ class GUI(GtkGUI, monitor.Watcher):
         self.setDataButtonState()
 
     def save_serversettings(self):
-        setting_dict = self.server_settings.copy()
+        setting_dict = dict()
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- system-config-printer.spec	3 Dec 2009 15:03:00 -0000	1.309
+++ system-config-printer.spec	3 Dec 2009 17:14:51 -0000	1.310
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-localize-statereason.patch
+Patch2: system-config-printer-browsepoll.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .localize-statereason
+%patch2 -p1 -b .browsepoll
 
 %build
 %configure
@@ -167,6 +169,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
 - Handle RuntimeError when localizing state reason (bug #543937).