From 2a95b6cf1aa69a6f5dd06797da5534e6460f3c79 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@activitycentral.org>
Date: Mon, 11 Jul 2011 13:18:56 +0000
Subject: [PATCH sugar] Avoid having tons of gnome-keyring-daemon while
restarting sugar-emulator #2960
---
bin/sugar.in | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/bin/sugar.in b/bin/sugar.in
index 7056377..808a3f9 100755
a
|
b
|
export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts |
65 | 65 | # Workaround until gnome-keyring-daemon lets dbus activate it |
66 | 66 | # https://bugzilla.gnome.org/show_bug.cgi?id=628302 |
67 | 67 | if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then |
68 | | gnome-keyring-daemon --components=secrets & |
| 68 | unset GNOME_KEYRING_CONTROL |
| 69 | unset SSH_AUTH_SOCK |
| 70 | unset GPG_AGENT_INFO |
| 71 | unset GNOME_KEYRING_PID |
69 | 72 | fi |
70 | 73 | |
71 | 74 | # Source language settings and debug definitions |