From f71e4c6351118a0d503d7f215983c67be1caab00 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 3 Dec 2009 17:12:43 +0000
Subject: [PATCH] - Don't overwrite BrowsePoll settings in basic settings
 dialog (bug     #543986).

---
 system-config-printer-browsepoll.patch | 12 ++++++++++++
 system-config-printer.spec             |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-browsepoll.patch

diff --git a/system-config-printer-browsepoll.patch b/system-config-printer-browsepoll.patch
new file mode 100644
index 0000000..892894d
--- /dev/null
+++ b/system-config-printer-browsepoll.patch
@@ -0,0 +1,12 @@
+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),
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 05d7d1c..8162c16 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -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
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
+Patch3: system-config-printer-browsepoll.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .localize-statereason
+%patch3 -p1 -b .browsepoll
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -190,6 +192,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-3
+- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-2
 - Handle RuntimeError when localizing state reason (bug #543937).