From 1d370ca8e5b8f4f4b863adb7bb9ea39fe885d284 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 27 Jul 2006 10:35:59 +0200
Subject: [PATCH] Minor fixes

---
 shell/Shell.py               | 4 +---
 shell/sugar                  | 3 +++
 shell/sugar-activity-factory | 7 +++++--
 shell/sugar-presence-service | 2 ++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/shell/Shell.py b/shell/Shell.py
index 4176b725..680f94f9 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -2,11 +2,9 @@ import os
 
 import dbus
 import dbus.glib
-import pygtk
-pygtk.require('2.0')
 import gtk
-import wnck
 import gobject
+import wnck
 
 from sugar.LogWriter import LogWriter
 from ActivityRegistry import ActivityRegistry
diff --git a/shell/sugar b/shell/sugar
index cff3c114..132c2fe6 100755
--- a/shell/sugar
+++ b/shell/sugar
@@ -5,6 +5,9 @@ import os
 import pwd
 import random
 
+import pygtk
+pygtk.require('2.0')
+
 def add_to_bin_path(path):
 	if os.environ.has_key('PATH'):
 		old_path = os.environ['PATH']
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 53789d41..c29c0745 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import sys
+import logging
 
 import pygtk
 pygtk.require('2.0')
@@ -10,10 +11,12 @@ from sugar.activity import Activity
 from sugar.LogWriter import LogWriter
 from sugar import theme
 
+logging.info('Starting activity factory %s' % sys.argv[1])
+
 theme.setup()
 
-#lw = LogWriter(sys.argv[1])
-#lw.start()
+lw = LogWriter(sys.argv[1])
+lw.start()
 
 if len(sys.argv) == 4:
 	Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3])
diff --git a/shell/sugar-presence-service b/shell/sugar-presence-service
index b0f7f417..4b939c42 100755
--- a/shell/sugar-presence-service
+++ b/shell/sugar-presence-service
@@ -10,4 +10,6 @@ if level == 'debug':
 	logging.basicConfig(level=logging.DEBUG,
 						format='%(levelname)s %(message)s')
 
+logging.info('Starting presence service')
+
 PresenceService.main()