From b2b9d73b5d628c8106ba0b4a54820c1425d78898 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Thu, 02 Sep 2010 14:36:58 +0000
Subject: Revert "Run gnome-keyring-daemon from sugar-emulator"

This reverts commit c11f6abcef78135a8bb47123889492e705b9f461.
---
diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index 8557b2f..5a99dbe 100644
--- a/src/jarabe/util/emulator.py
+++ b/src/jarabe/util/emulator.py
@@ -116,15 +116,6 @@ def _start_window_manager():
 
     gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
 
-
-def _start_gnome_keyring():
-    cmd = ['gnome-keyring-daemon']
-
-    cmd.extend(['--components=secrets'])
-
-    gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
-
-
 def _setup_env(display, scaling, emulator_pid):
     os.environ['SUGAR_EMULATOR'] = 'yes'
     os.environ['GABBLE_LOGFILE'] = os.path.join(
@@ -172,8 +163,6 @@ def main():
 
     command = ['dbus-launch', '--exit-with-session']
 
-    _start_gnome_keyring()
-
     if not args:
         command.append('sugar')
     else:
--
cgit v0.9.1