diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-14 00:05:24 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-14 00:05:24 -0700 |
| commit | 3ff20dedff636571ad0faa4736af5b23e4623ffe (patch) | |
| tree | ab4a70fe4e4a9113ff3483d8635eb46f8994c12a /extra/gconf/gconf-dbus-fix-shutdown.patch | |
| parent | 3efd178c050d911cfdff7e8d2ed4886b98b08b98 (diff) | |
Thu Mar 14 00:05:23 PDT 2013
Diffstat (limited to 'extra/gconf/gconf-dbus-fix-shutdown.patch')
| -rw-r--r-- | extra/gconf/gconf-dbus-fix-shutdown.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/extra/gconf/gconf-dbus-fix-shutdown.patch b/extra/gconf/gconf-dbus-fix-shutdown.patch deleted file mode 100644 index b294284b2..000000000 --- a/extra/gconf/gconf-dbus-fix-shutdown.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Tue, 06 Mar 2012 19:39:06 +0000 -Subject: 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. - -https://bugzilla.gnome.org/show_bug.cgi?id=671490 ---- -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; - --- -cgit v0.9.0.2 |