[glib2/f14/master] Fix a nautilus crash

[Matthias Clasen]

commit 80a33638af80b06c98ad58cdd596504cabd8c963
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 3 10:45:45 2010 -0400

    Fix a nautilus crash

 gio-flags.patch |   24 ++++++++++++++++++++++++
 glib2.spec      |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/gio-flags.patch b/gio-flags.patch
new file mode 100644
index 0000000..da21d09
--- /dev/null
+++ b/gio-flags.patch
@@ -0,0 +1,24 @@
+From 892012b951a5222a3e47afc18179b064420ff98b Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Sun, 01 Aug 2010 10:56:06 +0000
+Subject: GDBusConnection: fix message flags in g_dbus_connection_call_sync()
+
+GDBusCallFlags were used instead of GDBusSendMessageFlags for
+g_dbus_connection_send_message_with_reply_sync(). Fixes bug #625753.
+---
+diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
+index df52601..b81dfb3 100644
+--- a/gio/gdbusconnection.c
++++ b/gio/gdbusconnection.c
+@@ -5096,7 +5096,7 @@ g_dbus_connection_call_sync (GDBusConnection         *connection,
+   local_error = NULL;
+   reply = g_dbus_connection_send_message_with_reply_sync (connection,
+                                                           message,
+-                                                          flags,
++                                                         G_DBUS_SEND_MESSAGE_FLAGS_NONE,
+                                                           timeout_msec,
+                                                           NULL, /* volatile guint32 *out_serial */
+                                                           cancellable,
+--
+cgit v0.8.3.1
+
diff --git a/glib2.spec b/glib2.spec
index 9fd7631..165e3be 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.25.12
-Release: 1%{?dist}
+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: gio-flags.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 .gio-flags
 
 %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
+* Tue Aug  3 2010 Matthias Clasen <mclasen at redhat.com> - 2.25.12-2
+- Fix a bug that causes nautilus crashes
+
 * Mon Aug  2 2010 Matthias Clasen <mclasen at redhat.com> - 2.25.12-1
 - Update to 2.25.12