diff --git a/system-config-printer-short-lived-states.patch b/system-config-printer-short-lived-states.patch
new file mode 100644
index 0000000..2563520
--- /dev/null
+++ b/system-config-printer-short-lived-states.patch
@@ -0,0 +1,18 @@
+diff -up system-config-printer-1.1.15/jobviewer.py.short-lived-states system-config-printer-1.1.15/jobviewer.py
+--- system-config-printer-1.1.15/jobviewer.py.short-lived-states	2009-11-30 12:43:08.000000000 +0000
++++ system-config-printer-1.1.15/jobviewer.py	2009-12-09 10:53:20.936016882 +0000
+@@ -1430,7 +1430,13 @@ class JobViewer (GtkGUI, monitor.Watcher
+         try:
+             notification = self.state_reason_notifications[tuple]
+             if notification.get_data ('closed') != True:
+-                notification.close ()
++                try:
++                    notification.close ()
++                except glib.GError:
++                    # Can fail if the notification wasn't even shown
++                    # yet (as in bug #545733).
++                    pass
++
+             del self.state_reason_notifications[tuple]
+             self.set_statusicon_visibility ()
+         except KeyError:
diff --git a/system-config-printer.spec b/system-config-printer.spec
index ea04e79..2ae314a 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.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -21,6 +21,7 @@ Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
+Patch7: system-config-printer-short-lived-states.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -86,6 +87,7 @@ printers.
 %patch4 -p1 -b .cupsd.conf-parser
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
+%patch7 -p1 -b .short-lived-states
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +200,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-7
+- Fixed jobviewer traceback with short-lived state reasons (bug #545733).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-6
 - Fixed traceback with short lpd device URIs (bug #545397).