diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-03-06 14:39:06 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-03-18 23:37:30 -0400 |
| commit | 39299610083e0e7f9b44e62b7f4e51e89693cf89 (patch) | |
| tree | 0f0f86d406dff538edacd3431ff7869f687931dd | |
| parent | 02f12f41b031a1c2672e7cf1cb8ebde58288c547 (diff) | |
| download | gconf-39299610083e0e7f9b44e62b7f4e51e89693cf89.tar.gz | |
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
| -rw-r--r-- | 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 442a94b8..f167fc5b 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; |