diff options
Diffstat (limited to 'bin/sugar-session')
| -rwxr-xr-x[-rw-r--r--] | bin/sugar-session | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/sugar-session b/bin/sugar-session index 1582b65..91ebf6f 100644..100755 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -20,6 +20,7 @@ import os import sys import time import subprocess +import shutil if os.environ.get('SUGAR_LOGGER_LEVEL', '') == 'debug': print '%r STARTUP: Starting the shell' % time.time() @@ -78,7 +79,6 @@ def start_ui_service(): from jarabe.view.service import UIService ui_service = UIService() - ui_service.start() def start_session_manager(): from jarabe.model.session import get_session_manager @@ -203,6 +203,10 @@ def set_fonts(): def main(): try: from sugar import env + # Remove temporary files. See http://bugs.sugarlabs.org/ticket/1876 + data_dir = os.path.join(env.get_profile_path(), 'data') + shutil.rmtree(data_dir, ignore_errors=True) + os.makedirs(data_dir) cleanup_logs(env.get_logs_path()) except OSError, e: # logs cleanup is not critical; it should not prevent sugar from @@ -225,7 +229,7 @@ def main(): client = gconf.client_get_default() client.set_string('/apps/metacity/general/mouse_button_modifier', - 'disabled') + '<Super>') timezone = client.get_string('/desktop/sugar/date/timezone') if timezone is not None and timezone: |