[gnome-settings-daemon/f16] fix a crash

[Matthias Clasen]

commit 1d7746c0e714c2ede647a549b65aa99f529db6b9
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 16 13:54:16 2011 -0400

    fix a crash

 0001-color-don-t-use-uninitialized-GErrors.patch |   27 ++++++++++++++++++++++
 gnome-settings-daemon.spec                       |    9 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-color-don-t-use-uninitialized-GErrors.patch b/0001-color-don-t-use-uninitialized-GErrors.patch
new file mode 100644
index 0000000..c672c12
--- /dev/null
+++ b/0001-color-don-t-use-uninitialized-GErrors.patch
@@ -0,0 +1,27 @@
+From 2528fa0f2c5a6d88318498392e39d4c76669a544 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Tue, 16 Aug 2011 13:50:57 -0400
+Subject: [PATCH] color: don't use uninitialized GErrors
+
+It leads to crashes...
+https://bugzilla.redhat.com/show_bug.cgi?id=728903
+---
+ plugins/color/gcm-profile-store.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
+index eddc7ba..45bf43d 100644
+--- a/plugins/color/gcm-profile-store.c
++++ b/plugins/color/gcm-profile-store.c
+@@ -430,7 +430,7 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
+ {
+         gchar *path;
+         gboolean ret;
+-        GError *error;
++        GError *error = NULL;
+ 
+         /* get Linux per-user profiles */
+         path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
+-- 
+1.7.6
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 1610ea6..c6e1521 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        3.1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -16,6 +16,9 @@ Patch0:         chrony-support.patch
 Patch1:         fallback-mounter.patch
 Patch2:         0001-wacom-invert-TPCButton-setting.patch
 
+# upstream fix
+Patch3:         0001-color-don-t-use-uninitialized-GErrors.patch
+
 Requires(pre):    GConf2 >= 2.14
 Requires(preun):  GConf2 >= 2.14
 Requires(post):   GConf2 >= 2.14
@@ -68,6 +71,7 @@ developing applications that use %{name}.
 %patch0 -p1 -b .chrony
 %patch1 -p1 -b .fallback
 %patch2 -p1 -b .wacom-invert-tpcbutton
+%patch3 -p1 -b .color-crash
 
 # autoreconf -i -f
 
@@ -235,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Tue Aug 16 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.4-5
+- Fix a crash a startup (#728903)
+
 * Fri Aug 12 2011 Peter Hutterer <peter.hutterer at redhat.com> 3.1.4-4
 - This time with the patch.