daemon: When --replace quit all running daemons

 * When using --replace we assume that we're supposed to replace
   all running daemons in the session, rather than just the
   first we discovered.

https://bugzilla.gnome.org/show_bug.cgi?id=681449

1 files changed, 7 insertions, 1 deletions

diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
index 26b1f951..71cb98de 100644
--- a/daemon/gkd-main.c
+++ b/daemon/gkd-main.c
@@ -602,7 +602,13 @@ replace_daemon_at (const gchar *directory)
 	if (ret == TRUE)
 		g_usleep (200 * 1000); /* 200 ms in us */
 
-	return ret;
+	/*
+	 * Note that we don't return TRUE, since we want to quit all the
+	 * running daemons (for this session) that may have been started
+	 * by dbus or elsewhere.
+	 */
+
+	return FALSE;
 }
 
 typedef gboolean (*DiscoverFunc) (const gchar *control_directory);