diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-06-26 15:01:34 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2012-07-04 20:46:30 (GMT) |
| commit | f0ee9e9fae87fe54e8bd59244b012a2aba23131f (patch) | |
| tree | 0f692dbde3c448eb730b8d9186fa337c2edd934e /bin | |
| parent | f37b16cdb486bd979cfc8afab02435569b9ee663 (diff) | |
Enable gnome-keyring-daemon to start inside emulated session
We have the following situation: there is an instance of gnome-keyring-daemon
running on the machine. But sugar-emulator can't access this instance of
gnome-keyring-daemon, as it is outside the scope of sugar-emulator and not
registered with the D-Bus session bus started by sugar-emulator.
D-Bus tries to start a new instance of gnome-keyring-daemon, which fails due
to a set of environment variables related to gnome-keyring-daemon. These
essentially make gnome-keyring-daemon try to initialize the existing instance
of gnome-keyring-daemon outside the scope of sugar-emulator.
By removing these environment variables, D-Bus can start a new instance of
gnome-keyring-daemon and register with the D-Bus session.
See
https://bugzilla.gnome.org/show_bug.cgi?id=628302
and
https://live.gnome.org/GnomeKeyring/RunningDaemon
for more information.
[changed description and comment]
Signed-off-by: Caspar Bothmer <caspar@activitycentral.com>
Reviewed-by: Caspar Bothmer <caspar@activitycentral.com>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sugar.in | 6 |
1 files changed, 0 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 |