summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefw <stefw@localhost>2009-04-11 00:07:57 +0000
committerstefw <stefw@localhost>2009-04-11 00:07:57 +0000
commit33c9c3526dac9c5e53dce204d43b4433f4136ee4 (patch)
tree407b723c64114e6675764558da39a868ad379298
parent811209c2c9a01724c98a61b5bbc0190b3e0c83ee (diff)
downloadgnome-keyring-33c9c3526dac9c5e53dce204d43b4433f4136ee4.tar.gz
Don't autostart another gnome-keyring-daemon if one has already started.
Just initialize the one that's already running. svn path=/branches/gnome-2-26/; revision=1719
-rw-r--r--ChangeLog6
-rw-r--r--daemon/org.gnome.keyring.service.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 38d308eb..14fef64d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-04-10 Stef Walter <stef@memberwebs.com>
+ * daemon/org.gnome.keyring.service.in: Don't autostart
+ another gnome-keyring-daemon if one has already started,
+ just initialize the one that's already running.
+
+2009-04-10 Stef Walter <stef@memberwebs.com>
+
* configure.in: Bump glib dependency to 2.16, in all
the pkg-config checks.
diff --git a/daemon/org.gnome.keyring.service.in b/daemon/org.gnome.keyring.service.in
index 6633b682..84541c6f 100644
--- a/daemon/org.gnome.keyring.service.in
+++ b/daemon/org.gnome.keyring.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.gnome.keyring
-Exec=@PATH@/gnome-keyring-daemon --foreground --components=keyring
+Exec=@PATH@/gnome-keyring-daemon --start --foreground --components=keyring