rpms/system-config-printer/F-11 system-config-printer-jobviewer-exit.patch, NONE, 1.1 system-config-printer.spec, 1.320, 1.321
Tim Waugh
twaugh at fedoraproject.org
Wed Jan 6 15:30:39 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3590
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-jobviewer-exit.patch
Log Message:
* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Avoid traceback in on_jobviewer_exit (bug #550437).
system-config-printer-jobviewer-exit.patch:
system-config-printer.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE system-config-printer-jobviewer-exit.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.jobviewer-exit system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.jobviewer-exit 2010-01-06 15:25:57.525409643 +0000
+++ system-config-printer-1.1.16/system-config-printer.py 2010-01-06 15:27:03.767283548 +0000
@@ -2837,7 +2837,8 @@ class GUI(GtkGUI, monitor.Watcher):
def on_quit_activate(self, widget, event=None):
self.monitor.cleanup ()
while len (self.jobviewers) > 0:
- self.jobviewers[0].cleanup () # this will call on_jobviewer_exit
+ # this will call on_jobviewer_exit
+ self.jobviewers[0].on_delete_event ()
del self.mainlist
del self.printers
gtk.main_quit()
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- system-config-printer.spec 23 Dec 2009 16:15:21 -0000 1.320
+++ system-config-printer.spec 6 Jan 2010 15:30:39 -0000 1.321
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.16
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
Patch1: system-config-printer-typo.patch
Patch2: system-config-printer-driver-pre-selection.patch
Patch3: system-config-printer-foomatic-recommended.patch
+Patch4: system-config-printer-jobviewer-exit.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -69,6 +70,7 @@ the configuration tool.
%patch1 -p1 -b .typo
%patch2 -p1 -b .driver-pre-selection
%patch3 -p1 -b .foomatic-recommended
+%patch4 -p1 -b .jobviewer-exit
%build
%configure
@@ -175,6 +177,9 @@ rm -rf %buildroot
exit 0
%changelog
+* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Avoid traceback in on_jobviewer_exit (bug #550437).
+
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Prefer foomatic-recommended drivers (bug #550108).
- Pre-select correct driver when adding or changing a queue (bug #550075).
More information about the fedora-extras-commits
mailing list