- Fixed traceback when copying printer with certain job options set (bug

#554268).

clog1

@@ -0,0 +1,2 @@
+* Wed Jan  6 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-3
+- Fixed pycups IPPRequest attribute handling bug.

system-config-printer-check-still-connecting.patch

@@ -0,0 +1,24 @@
+diff -up system-config-printer-1.1.16/monitor.py.check-still-connecting system-config-printer-1.1.16/monitor.py
+--- system-config-printer-1.1.16/monitor.py.check-still-connecting	2009-12-22 14:44:19.000000000 +0000
++++ system-config-printer-1.1.16/monitor.py	2010-01-18 16:31:05.664560326 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ 
+-## Copyright (C) 2007, 2008, 2009 Tim Waugh <twaugh@redhat.com>
+-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
++## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc.
++## Author: Tim Waugh <twaugh@redhat.com>
+ 
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+@@ -208,7 +208,9 @@ class Monitor:
+             self.connecting_timers[printer] = timer
+             return False
+ 
+-        del self.connecting_timers[printer]
++        if self.connecting_timers.has_key (printer):
++            del self.connecting_timers[printer]
++
+         debugprint ("Still-connecting timer fired for `%s'" % printer)
+         (printer_jobs, my_printers) = self.sort_jobs_by_printer ()
+         self.update_connecting_devices (printer_jobs)

system-config-printer.spec

@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -26,6 +26,7 @@ Patch8: system-config-printer-select-nonexistent-printer.patch
 Patch9: system-config-printer-ink-levels.patch
 Patch10: system-config-printer-auth-no-pw.patch
 Patch11: system-config-printer-copy-crash.patch
+Patch12: system-config-printer-check-still-connecting.patch
 
 Patch101: pycups-request-readio.patch
 
@@ -98,6 +99,7 @@ printers.
 %patch9 -p1 -b .ink-levels
 %patch10 -p1 -b .auth-no-pw
 %patch11 -p1 -b .copy-crash
+%patch12 -p1 -b .check-still-connecting
 
 pushd pycups-%{pycups_version}
 %patch101 -p1 -b .request-readio
@@ -218,6 +220,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Jan 18 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-9
+- Avoid traceback when checking on connecting backends (bug #555552).
+
 * Mon Jan 11 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-8
 - Fixed traceback when copying printer with certain job options
   set (bug #554268).