From 61ce8597e823d4aa1713dc701f9038f8149430e1 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 23 Feb 2011 10:36:59 -0500
Subject: [PATCH] Include an upstream patch to fix a possible crasher

---
 g-s-d-fix-crasher-screensaver-unlock.patch | 27 ++++++++++++++++++++++
 gnome-settings-daemon.spec                 |  9 +++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 g-s-d-fix-crasher-screensaver-unlock.patch

diff --git a/g-s-d-fix-crasher-screensaver-unlock.patch b/g-s-d-fix-crasher-screensaver-unlock.patch
new file mode 100644
index 0000000..f85db79
--- /dev/null
+++ b/g-s-d-fix-crasher-screensaver-unlock.patch
@@ -0,0 +1,27 @@
+commit 90c0f8676b06041c599fd941514e09ba8704f0ef
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Date:   Tue Feb 22 08:35:37 2011 +0100
+
+    automount: Fix crash when unlocking screen saver
+    
+    Fix commit 71deedf: We _do_ expect that some volumes have queued up in
+    check_volume_queue() once the screen saver got inactive, so don't crash with an
+    assertion failure in this case.
+    
+    Just check whether the screen saver is active, and don't mount anything if so.
+
+diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
+index 788a5fe..5988f2b 100644
+--- a/plugins/automount/gsd-automount-manager.c
++++ b/plugins/automount/gsd-automount-manager.c
+@@ -184,8 +184,8 @@ check_volume_queue (GsdAutomountManager *manager)
+ 
+         l = manager->priv->volume_queue;
+ 
+-        if (!manager->priv->screensaver_active) {
+-                g_assert (l == NULL);
++        if (manager->priv->screensaver_active) {
++                return;
+         }
+ 
+         while (l != NULL) {
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index e50e2fd..f58c244 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        2.91.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -35,6 +35,8 @@ BuildRequires:  autoconf automake libtool
 BuildRequires:  libxklavier-devel
 BuildRequires:  gsettings-desktop-schemas-devel >= 0.1.7
 
+Patch1: g-s-d-fix-crasher-screensaver-unlock.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -52,6 +54,8 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
+%patch1 -p1 -b .unlock
+
 %build
 # https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
 #export LIBS="-lX11 -lm"
@@ -114,6 +118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Feb 23 2011 Cosimo Cecchi <cosimoc@redhat.com> - 2.91.90-2
+- Include an upstream patch to fix a possible crasher
+
 * Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 2.91.90-1
 - Update to 2.91.90