diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-02 14:36:58 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-02 14:36:58 (GMT) |
| commit | b2b9d73b5d628c8106ba0b4a54820c1425d78898 (patch) | |
| tree | bb0d4bcbe164913779ba544bb604a869676807e2 | |
| parent | 2361ef79cad74beb01cb4d19c268aa0bbc57d06f (diff) | |
Revert "Run gnome-keyring-daemon from sugar-emulator"
This reverts commit c11f6abcef78135a8bb47123889492e705b9f461.
| -rw-r--r-- | src/jarabe/util/emulator.py | 11 |
1 files changed, 0 insertions, 11 deletions
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: |