Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-09-02 15:51:02 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-09-02 15:51:02 (GMT)
commit9511671da0010b2813b4c05c621579828287c8cd (patch)
treecad28dc7ac14ab20d518e1165b754c0ec83b6a19
parentb2b9d73b5d628c8106ba0b4a54820c1425d78898 (diff)
Run gnome-keyring-daemon from the 'sugar' script if we are running in Xephyr
-rw-r--r--bin/sugar.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/sugar.in b/bin/sugar.in
index 2df0ab8..12098db 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -62,6 +62,12 @@ export LANGUAGE="${LANGUAGE:-${LANG}}"
# Set Sugar's telepathy accounts directory
export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
+# Workaround until gnome-keyring-daemon lets dbus activate it
+# https://bugzilla.gnome.org/show_bug.cgi?id=628302
+if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then
+ gnome-keyring-daemon --components=secrets &
+fi
+
# Source language settings and debug definitions
if [ -f ~/.i18n ]; then
. ~/.i18n