From 723c2ed9d2935930efb7bcc919d5c47cf7412e98 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 6 Jan 2010 15:31:58 +0000
Subject: [PATCH] - Avoid traceback in on_jobviewer_exit (bug #550437).

---
 system-config-printer-jobviewer-exit.patch | 13 +++++++++++++
 system-config-printer.spec                 |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-jobviewer-exit.patch

diff --git a/system-config-printer-jobviewer-exit.patch b/system-config-printer-jobviewer-exit.patch
new file mode 100644
index 0000000..1d87b23
--- /dev/null
+++ b/system-config-printer-jobviewer-exit.patch
@@ -0,0 +1,13 @@
+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()
diff --git a/system-config-printer.spec b/system-config-printer.spec
index a7d6f96..d8ba832 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.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-typo.patch
 Patch3: system-config-printer-driver-pre-selection.patch
 Patch4: system-config-printer-foomatic-recommended.patch
+Patch5: system-config-printer-jobviewer-exit.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -82,6 +83,7 @@ printers.
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .driver-pre-selection
 %patch4 -p1 -b .foomatic-recommended
+%patch5 -p1 -b .jobviewer-exit
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +200,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Jan  6 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-3
+- Avoid traceback in on_jobviewer_exit (bug #550437).
+
 * Wed Dec 23 2009 Tim Waugh <twaugh@redhat.com> - 1.1.16-2
 - Prefer foomatic-recommended drivers (bug #550108).
 - Pre-select correct driver when adding or changing a queue (bug #550075).