- Don't overwrite BrowsePoll settings in basic settings dialog (bug

#543986).
This commit is contained in:
Tim Waugh 2009-12-03 17:12:43 +00:00
parent 784addac2c
commit f71e4c6351
2 changed files with 18 additions and 1 deletions

View File

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

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.15 Version: 1.1.15
Release: 2%{?dist} Release: 3%{?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
@ -17,6 +17,7 @@ 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-localize-statereason.patch Patch2: system-config-printer-localize-statereason.patch
Patch3: system-config-printer-browsepoll.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -78,6 +79,7 @@ printers.
%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 .localize-statereason %patch2 -p1 -b .localize-statereason
%patch3 -p1 -b .browsepoll
%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 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 * Thu Dec 3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-2
- Handle RuntimeError when localizing state reason (bug #543937). - Handle RuntimeError when localizing state reason (bug #543937).