[glib2/f14/master] Fix a problem with evince startup

[Matthias Clasen]

commit 1e82c0d76f56a20ebcd6c6e3c5246417c122f06e
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Sep 30 14:55:23 2010 -0400

    Fix a problem with evince startup

 ...write_data_free-Don-t-unref-data-message-.patch |   29 ++++++++++++++++++++
 glib2.spec                                         |    9 +++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0001-message_to_write_data_free-Don-t-unref-data-message-.patch b/0001-message_to_write_data_free-Don-t-unref-data-message-.patch
new file mode 100644
index 0000000..abdd662
--- /dev/null
+++ b/0001-message_to_write_data_free-Don-t-unref-data-message-.patch
@@ -0,0 +1,29 @@
+From 2a9b14c015a05cd8dc16a2c5bce2d531c76824c8 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 30 Sep 2010 14:40:50 -0400
+Subject: [PATCH] message_to_write_data_free: Don't unref data->message if it is NULL
+
+After the recent changes to message filtering, it can happen that
+data->message is NULL when we get here.
+(cherry picked from commit fe1186a842458dcc647c5f9ab03f17c762354e95)
+---
+ gio/gdbusprivate.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
+index 442d5e1..dd9d58a 100644
+--- a/gio/gdbusprivate.c
++++ b/gio/gdbusprivate.c
+@@ -876,7 +876,8 @@ static void
+ message_to_write_data_free (MessageToWriteData *data)
+ {
+   _g_dbus_worker_unref (data->worker);
+-  g_object_unref (data->message);
++  if (data->message)
++    g_object_unref (data->message);
+   g_free (data->blob);
+   g_free (data);
+ }
+-- 
+1.7.3
+
diff --git a/glib2.spec b/glib2.spec
index 4171275..5262f46 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.26.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -27,6 +27,9 @@ BuildRequires: gtk-doc
 # required for GIO content-type support
 Requires: shared-mime-info
 
+# upstream fix
+Patch0: 0001-message_to_write_data_free-Don-t-unref-data-message-.patch
+
 %description
 GLib is the low-level core library that forms the basis for projects
 such as GTK+ and GNOME. It provides data structure handling for C,
@@ -53,6 +56,7 @@ The glib2-static package includes static libraries of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .evince-startup
 
 %build
 # Support builds of both git snapshots and tarballs packed with autogoo
@@ -158,6 +162,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Sep 30 2010 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Fix a bug that affects evince startup (#638708)
+
 * Wed Sep 29 2010 jkeating - 2.26.0-1.1
 - Rebuilt for gcc bug 634757