[GConf2/f16] fix shutdown for spot

[Ray Strode]

commit 7d6b8f9ea05251ac947c43c02187978a7536bd91
Author: Ray Strode <rstrode at redhat.com>
Date:   Tue Mar 6 14:47:22 2012 -0500

    fix shutdown for spot

 GConf2.spec        |   10 ++++++++--
 fix-shutdown.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/GConf2.spec b/GConf2.spec
index 01bdb1c..ffc8d6e 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,7 +6,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 3.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
@@ -23,6 +23,9 @@ Patch3: 0003-Bump-GIO-dep-to-2.32.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=670033
 Patch4: fix-crasher.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=671490
+Patch5: fix-shutdown.patch
+
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: libxslt-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -79,7 +82,7 @@ which require GTK+.
 #patch2 -p1 -b .skip-nonexisting-schemas
 #patch3 -p1 -b .bump-gio-dep-to-2.32
 %patch4 -p1 -b .fix-crasher
-
+%patch5 -p1 -b .fix-shutdown
 
 %build
 %configure --disable-static --enable-defaults-service --disable-orbit --with-gtk=3.0
@@ -170,6 +173,9 @@ fi
 %doc %{_mandir}/man1/gsettings-schema-convert.1*
 
 %changelog
+* Tue Mar 06 2012 Ray Strode <rstrode at redhat.com> 3.2.3-4
+- Fix shutdown for spot
+
 * Mon Feb 13 2012 Ray Strode <rstrode at redhat.com> 3.2.3-3
 - Potentially fix crasher bug
   Resolves: #756245
diff --git a/fix-shutdown.patch b/fix-shutdown.patch
new file mode 100644
index 0000000..a353330
--- /dev/null
+++ b/fix-shutdown.patch
@@ -0,0 +1,36 @@
+From 81bf551afedd06b22eb55c00e95b344f89efd228 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 6 Mar 2012 14:39:06 -0500
+Subject: [PATCH] dbus: fix shutdown
+
+gconftool-2 wasn't properly shutting down gconfd, because
+it was trying to do it before connecting to the daemon.
+
+This commit makes sure that we always first try to connect to
+the daemon before asking it to shutdown.
+---
+ gconf/gconf-dbus.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
+index 442a94b..f167fc5 100644
+--- a/gconf/gconf-dbus.c
++++ b/gconf/gconf-dbus.c
+@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err)
+ {
+   DBusMessage *message;
+ 
+-  /* Don't want to spawn it if it's already down */
++  /* If we haven't reached out to it yet,
++   * reach out now.
++   */
++  if (global_conn == NULL)
++    gconf_ping_daemon();
++
++  /* But we don't want to spawn it if it's already down */
+   if (global_conn == NULL || !service_running)
+     return;
+   
+-- 
+1.7.9.1
+