[xfce4-settings] Add patch to fix crash in helper when screenshooter isn't installed. Fixes bug #701550

[Kevin Fenzi]

commit ccaf8fc96dae924082b3f6d7fef8ec8e20bb44db
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon May 9 15:33:36 2011 -0600

    Add patch to fix crash in helper when screenshooter isn't installed.
    Fixes bug #701550

 xfce4-settings-4.8.1-helper-crash.patch |   23 +++++++++++++++++++++++
 xfce4-settings.spec                     |   10 +++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-settings-4.8.1-helper-crash.patch b/xfce4-settings-4.8.1-helper-crash.patch
new file mode 100644
index 0000000..da53d9d
--- /dev/null
+++ b/xfce4-settings-4.8.1-helper-crash.patch
@@ -0,0 +1,23 @@
+From cd4497fbf25c52159cb341fc8f4b451ad4c5aac8 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Sun, 08 May 2011 20:54:06 +0000
+Subject: Do not show an error if spawning fails (bug #7574).
+
+g_error calls abort, so it should never be used unless the
+error is also fatal for the application.
+---
+diff --git a/xfce4-settings-helper/keyboard-shortcuts.c b/xfce4-settings-helper/keyboard-shortcuts.c
+index aabd084..81ae248 100644
+--- a/xfce4-settings-helper/keyboard-shortcuts.c
++++ b/xfce4-settings-helper/keyboard-shortcuts.c
+@@ -282,7 +282,7 @@ xfce_keyboard_shortcuts_helper_shortcut_activated (XfceShortcutsGrabber        *
+ 
+   if (!succeed)
+     {
+-      g_error ("Failed to spawn command \"%s\": %s", sc->command, error->message);
++      g_warning ("Failed to spawn command \"%s\": %s", sc->command, error->message);
+       g_error_free (error);
+     }
+ 
+--
+cgit 
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index 35d9b12..de40943 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -2,7 +2,7 @@
 
 Name:           xfce4-settings
 Version:        4.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -12,6 +12,9 @@ URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # use vendor's artwork
 Patch0:         xfce4-settings-4.6.0-fedora.patch
+# Fix crash on helper spawning error
+# https://bugzilla.xfce.org/show_bug.cgi?id=7574
+Patch1:		xfce4-settings-4.8.1-helper-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -41,6 +44,7 @@ This package includes the settings manager applications for the Xfce desktop.
 %prep
 %setup -q
 %patch0 -p1 -b .vendor
+%patch1 -p1 -b .helper
 
 %build
 %configure --enable-sound-settings --enable-pluggable-dialogs
@@ -82,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Mon May 09 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.1-4
+- Add patch to fix crash in helper when screenshooter isn't installed. 
+- Fixes bug #701550
+
 * Fri Apr 08 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-3
 - Change default theme to Adwaita (#694889)