summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagn@cs.stanford.edu>2015-10-09 16:07:24 -0700
committerGiovanni Campagna <gcampagn@cs.stanford.edu>2015-11-12 16:17:07 -0800
commit7a475c66b1502b9b553603167730fa83e51791b6 (patch)
tree771c0188b631b29800bf3cdc40a0924f5061f2e5
parent6cb5a319437842c308d02e3e75a106b0cf069869 (diff)
downloadgnome-keyring-7a475c66b1502b9b553603167730fa83e51791b6.tar.gz
daemon: move autostart to PreDisplayServer phase
Which, as the name implies, runs before the DisplayServer, ie, before gnome-shell-wayland, and makes sure gnome-shell and its descendants see the right environment variable. https://bugzilla.gnome.org/show_bug.cgi?id=756324
-rw-r--r--daemon/gnome-keyring-pkcs11.desktop.in.in2
-rw-r--r--daemon/gnome-keyring-secrets.desktop.in.in2
-rw-r--r--daemon/gnome-keyring-ssh.desktop.in.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in.in
index 1b8b2c6c..96e1a691 100644
--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
+++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
@@ -4,7 +4,7 @@ _Name=Certificate and Key Storage
_Comment=GNOME Keyring: PKCS#11 Component
Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11
OnlyShowIn=GNOME;Unity;MATE;
-X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Phase=PreDisplayServer
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in.in
index a9e6a182..46ef7cd1 100644
--- a/daemon/gnome-keyring-secrets.desktop.in.in
+++ b/daemon/gnome-keyring-secrets.desktop.in.in
@@ -4,7 +4,7 @@ _Name=Secret Storage Service
_Comment=GNOME Keyring: Secret Service
Exec=@bindir@/gnome-keyring-daemon --start --components=secrets
OnlyShowIn=GNOME;Unity;MATE;
-X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Phase=PreDisplayServer
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in.in
index 88a727f1..412ae1dd 100644
--- a/daemon/gnome-keyring-ssh.desktop.in.in
+++ b/daemon/gnome-keyring-ssh.desktop.in.in
@@ -4,7 +4,7 @@ _Name=SSH Key Agent
_Comment=GNOME Keyring: SSH Agent
Exec=@bindir@/gnome-keyring-daemon --start --components=ssh
OnlyShowIn=GNOME;Unity;MATE;
-X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Phase=PreDisplayServer
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME