[gnome-keyring] daemon: When --replace quit all running daemons
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] daemon: When --replace quit all running daemons
- Date: Sat, 11 Aug 2012 05:22:22 +0000 (UTC)
commit 6da2939d0b6572c445555985da3ac5da234ad4f6
Author: Stef Walter <stefw gnome org>
Date: Wed Aug 8 15:15:34 2012 +0200
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
daemon/gkd-main.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
index 26b1f95..71cb98d 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]