From 592da9d58ead213254a38808cba468fc3268ff2a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Oct 14 2009 21:30:30 +0000
Subject: - Die on ctrl-alt-backspace and other abrupt exits


---

diff --git a/gnome-keyring-2.28.0-die-on-session-exit.patch b/gnome-keyring-2.28.0-die-on-session-exit.patch
new file mode 100644
index 0000000..e2bbd13
--- /dev/null
+++ b/gnome-keyring-2.28.0-die-on-session-exit.patch
@@ -0,0 +1,17 @@
+diff -up gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c
+--- gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit	2009-10-14 17:18:03.396005149 -0400
++++ gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c	2009-10-14 17:15:03.498984754 -0400
+@@ -145,8 +145,12 @@ signal_filter (DBusConnection *conn, DBu
+ 		unregister_daemon_in_session ();
+ 		gkr_daemon_quit ();
+ 		return DBUS_HANDLER_RESULT_HANDLED;
++	} else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
++		unregister_daemon_in_session ();
++		gkr_daemon_quit ();
++		return DBUS_HANDLER_RESULT_HANDLED;
+ 	}
+-	
++
+ 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 138e4ae..0da76dd 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -19,6 +19,9 @@ Patch0: gnome-keyring-no-logout-delay.patch
 # fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
 Patch1: rsa1-keys.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598494
+Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +76,7 @@ automatically unlock the "login" keyring when the user logs in.
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .logout-delay
 %patch1 -p1 -b .rsa1-keys
+%patch2 -p1 -b .die-on-session-exit
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -150,6 +154,9 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Ray Strode <rstrode@redhat.com> - 2.28.0-4
+- Die on ctrl-alt-backspace and other abrupt exits
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.0-3
 - Fix handling of rsa1 keys