[Sugar-devel] [PATCH sugar] Unset gnome keyring environment variables

[Daniel Narvaez]

Rather than starting it manually. As suggested on
https://bugzilla.gnome.org/show_bug.cgi?id=628302
---
 bin/sugar.in                |    6 ------
 src/jarabe/util/emulator.py |    5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/sugar.in b/bin/sugar.in
index 12098db..2df0ab8 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -62,12 +62,6 @@ 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
diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index fda1b59..bbfa73a 100644
--- a/src/jarabe/util/emulator.py
+++ b/src/jarabe/util/emulator.py
@@ -120,6 +120,11 @@ def _start_window_manager():
 
 
 def _setup_env(display, scaling, emulator_pid):
+    for variable in ['GPG_AGENT_INFO', 'SSH_AUTH_SOCK',
+                     'GNOME_KEYRING_CONTROL', 'GNOME_KEYRING_PID']:
+        if variable in os.environ:
+            del os.environ[variable]
+
     os.environ['SUGAR_EMULATOR'] = 'yes'
     os.environ['GABBLE_LOGFILE'] = os.path.join(
             env.get_profile_path(), 'logs', 'telepathy-gabble.log')
-- 
1.7.10.2