[gnome-color-manager] 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport a crash fix from mainline.

[Adam Jackson]

commit fa7b92dc42b9d121e6158516e9b4564dba4018d7
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 6 10:25:24 2011 -0400

    0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport
    a crash fix from mainline.

 ...error-pointer-for-gdk_pixbuf_new_from_fil.patch |   27 ++++++++++++++++++++
 gnome-color-manager.spec                           |    8 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch b/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch
new file mode 100644
index 0000000..586193a
--- /dev/null
+++ b/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch
@@ -0,0 +1,27 @@
+From e0c575ea768f2f5bb01cfc02908ddd48e691999d Mon Sep 17 00:00:00 2001
+From: Michael Hamann <michael at content-space.de>
+Date: Mon, 3 Oct 2011 00:49:55 +0200
+Subject: [PATCH] Initialize error pointer for
+ gdk_pixbuf_new_from_file_at_size properly
+
+Signed-off-by: Richard Hughes <richard at hughsie.com>
+---
+ src/gcm-calibrate-main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c
+index b8ef50a..cdf25ac 100644
+--- a/src/gcm-calibrate-main.c
++++ b/src/gcm-calibrate-main.c
+@@ -2072,7 +2072,7 @@ gcm_calib_image_changed_cb (GcmCalibrate *calibrate,
+ {
+ 	gchar *path;
+ 	GdkPixbuf *pixbuf;
+-	GError *error;
++	GError *error = NULL;
+ 
+ 	if (filename != NULL) {
+ 		path = g_build_filename (GCM_DATA, "icons", filename, NULL);
+-- 
+1.7.6.4
+
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index a8e6c15..37cde44 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,11 +1,12 @@
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
 Version:   3.2.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
 Source0:   http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz
+Patch0:    0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch
 
 Requires:  color-filesystem >= 1-7
 Requires:  gnome-icon-theme
@@ -49,6 +50,7 @@ and generate color profiles in the GNOME desktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .rui
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -102,6 +104,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
 
 %changelog
+* Thu Oct 06 2011 Adam Jackson <ajax at redhat.com> 3.2.0-3
+- 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport
+  a crash fix from mainline.
+
 * Mon Sep 26 2011 Richard Hughes <rhughes at redhat.com> - 3.2.0-2
 - Rebuild for libmash API update.