rpms/system-config-printer/F-11 system-config-printer-select-nonexistent-printer.patch, NONE, 1.1 system-config-printer.spec, 1.323, 1.324
Tim Waugh
twaugh at fedoraproject.org
Wed Jan 6 15:50:01 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9024
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-select-nonexistent-printer.patch
Log Message:
* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Make sure the printer we added still exists before selecting it
(bug #551436).
system-config-printer-select-nonexistent-printer.patch:
system-config-printer.py | 7 +++++++
1 file changed, 7 insertions(+)
--- NEW FILE system-config-printer-select-nonexistent-printer.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.select-nonexistent-printer system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.select-nonexistent-printer 2010-01-06 15:46:02.056410131 +0000
+++ system-config-printer-1.1.16/system-config-printer.py 2010-01-06 15:46:54.226408979 +0000
@@ -6896,6 +6896,8 @@ class NewPrinterGUI(GtkGUI):
self.mainapp.cups.addPrinter(name, ppd=ppd)
except cups.IPPError, (e, msg):
self.show_IPP_Error(e, msg)
+ self.mainapp.cups._end_operation ()
+ return
self.mainapp.cups._end_operation ()
@@ -6923,6 +6925,11 @@ class NewPrinterGUI(GtkGUI):
iter = model.iter_next (iter)
+ if not self.printers.has_key (name):
+ # At this stage the printer has disappeared even though we
+ # only added it moments ago.
+ return
+
# Load information about the printer,
# e.g. self.mainapp.server_side_options and self.mainapp.ppd
# (both used below).
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- system-config-printer.spec 6 Jan 2010 15:46:15 -0000 1.323
+++ system-config-printer.spec 6 Jan 2010 15:50:01 -0000 1.324
@@ -21,6 +21,7 @@ Patch3: system-config-printer-foomatic-r
Patch4: system-config-printer-jobviewer-exit.patch
Patch5: system-config-printer-npinit-traceback.patch
Patch6: system-config-printer-notification-timeouts.patch
+Patch7: system-config-printer-select-nonexistent-printer.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -75,6 +76,7 @@ the configuration tool.
%patch4 -p1 -b .jobviewer-exit
%patch5 -p1 -b .npinit-traceback
%patch6 -p1 -b .notification-timeouts
+%patch7 -p1 -b .select-nonexistent-printer
%build
%configure
@@ -182,6 +184,8 @@ exit 0
%changelog
* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Make sure the printer we added still exists before selecting it
+ (bug #551436).
- Set notification timeouts appropriately (bug #550829).
- Avoid traceback in NewPrinterGUI.init (bug #550442).
- Avoid traceback in on_jobviewer_exit (bug #550437).
More information about the fedora-extras-commits
mailing list