diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-12-01 20:24:24 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-12-01 20:24:24 (GMT) |
commit | cf156fac07bcf7f81029a29d31f5a6b3e79080c8 (patch) | |
tree | d766844ac385de19846161a63f457b39b83d9d0f /sugar-emulator | |
parent | 0e2d9b496ab12d512e56041d9f4ffbadf7fab4ab (diff) |
Get rid of our custom dbus config, simplify stuff
Diffstat (limited to 'sugar-emulator')
-rwxr-xr-x | sugar-emulator | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sugar-emulator b/sugar-emulator index a45f73e..6def3c1 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -48,19 +48,15 @@ if sourcedir: else: os.environ['PATH'] = bin_path - source = os.path.join(sourcedir, 'activities') - runner = os.path.join(sourcedir, 'shell/sugar-activity-factory') - setup.setup_activities(source, env.get_activity_info_dir(), runner) - bin = os.path.join(sourcedir, 'services/presence/sugar-presence-service') setup.write_service('org.laptop.Presence', bin, - env.get_activity_info_dir()) + env.get_user_service_dir()) bin = os.path.join(sourcedir, 'services/clipboard/sugar-clipboard') setup.write_service('org.laptop.Clipboard', bin, - env.get_activity_info_dir()) + env.get_user_service_dir()) from sugar.emulator import Emulator @@ -76,7 +72,4 @@ for i in range(1, len(sys.argv)): emulator = Emulator(fullscreen) emulator.start() -dbus_config = env.get_dbus_config() - -os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', - '--config-file=%s' % dbus_config, program) +os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program) |