Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activities/chat/ChatActivity.py4
-rw-r--r--sugar/activity/Activity.py6
2 files changed, 6 insertions, 4 deletions
diff --git a/activities/chat/ChatActivity.py b/activities/chat/ChatActivity.py
index 07d8762..694e100 100644
--- a/activities/chat/ChatActivity.py
+++ b/activities/chat/ChatActivity.py
@@ -8,7 +8,6 @@ import gtk
import gobject
from sugar.activity.Activity import Activity
-from sugar.LogWriter import LogWriter
from sugar.presence import Service
from sugar.chat.Chat import Chat
from sugar.chat.BuddyChat import BuddyChat
@@ -105,9 +104,6 @@ class ChatShell:
chat.connect_to_shell()
return False
-log_writer = LogWriter("Chat")
-log_writer.start()
-
chat_shell = ChatShell.get_instance()
chat_shell.start()
diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py
index 8d86f7d..b9dbd44 100644
--- a/sugar/activity/Activity.py
+++ b/sugar/activity/Activity.py
@@ -8,6 +8,8 @@ import pygtk
pygtk.require('2.0')
import gtk, gobject
+from sugar.LogWriter import LogWriter
+
SHELL_SERVICE_NAME = "com.redhat.Sugar.Shell"
SHELL_SERVICE_PATH = "/com/redhat/Sugar/Shell"
@@ -81,7 +83,11 @@ def create(activity_name, service = None, args = None):
def main(activity_name, activity_class):
"""Starts the activity main loop."""
+ log_writer = LogWriter(activity_name)
+ log_writer.start()
+
factory = ActivityFactory(activity_name, activity_class)
+
gtk.main()
class ActivityDbusService(dbus.service.Object):