From 9511671da0010b2813b4c05c621579828287c8cd Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Thu, 02 Sep 2010 15:51:02 +0000
Subject: Run gnome-keyring-daemon from the 'sugar' script if we are running in Xephyr

---
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
--
cgit v0.9.1