diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-11 11:05:33 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-11 11:05:33 (GMT) |
commit | 628271959c97c49b64ed16203a5d8a2d0202ede7 (patch) | |
tree | 33e1e34f6d619d6fa7cf1c47da67d587e13194e4 /shell/Shell.py | |
parent | cb47f17b31dde57823d46d974e983aa7fe7cad98 (diff) |
Refactor the console stuff
Diffstat (limited to 'shell/Shell.py')
-rwxr-xr-x | shell/Shell.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/shell/Shell.py b/shell/Shell.py index 0baea0e..b142963 100755 --- a/shell/Shell.py +++ b/shell/Shell.py @@ -18,6 +18,7 @@ from ActivityHost import ActivityHost from ChatController import ChatController from sugar.activity import ActivityFactory from sugar.activity import Activity +import sugar.logger class ShellDbusService(dbus.service.Object): def __init__(self, shell, bus_name): @@ -59,13 +60,12 @@ class Shell(gobject.GObject): self._console_windows = {} def start(self): - #log_writer = LogWriter("Shell", False) - #log_writer.start() - session_bus = dbus.SessionBus() bus_name = dbus.service.BusName('com.redhat.Sugar.Shell', bus=session_bus) ShellDbusService(self, bus_name) + sugar.logger.start('Shell', self) + self._owner = ShellOwner() self._owner.announce() @@ -132,6 +132,9 @@ class Shell(gobject.GObject): module = self._registry.get_activity(activity.get_default_type()) console = self.get_console(module.get_id()) activity.show_dialog(console) + else: + console = self.get_console('Shell') + console.show() def join_activity(self, service): info = self._registry.get_activity(service.get_type()) |