Split the factory to his own module

3 files changed, 11 insertions, 8 deletions

diff --git a/shell/HomeWindow.py b/shell/HomeWindow.py
index a0c9f82..ef44f61 100644
--- a/shell/HomeWindow.py
+++ b/shell/HomeWindow.py
@@ -3,7 +3,7 @@ from gettext import gettext as _
 import gtk
 import wnck
 
-from sugar.activity import Activity
+from sugar.activity import ActivityFactory
 from ActivitiesModel import ActivitiesModel
 from sugar.presence.PresenceService import PresenceService
 
@@ -79,7 +79,7 @@ class ActivitiesGrid(gtk.VBox):
 		activity_ps = pservice.get_activity(activity_id)
 
 		if activity_ps:
-			Activity.create(activity.get_id(), activity_ps)
+			ActivityFactory.create(activity.get_id(), activity_ps)
 		else:
 			print 'Cannot start activity.'
 
@@ -168,7 +168,7 @@ class HomeWindow(gtk.Window):
 		return self._shell.get_registry().list_activities()
 
 	def create(self, activity_name):
-		Activity.create(activity_name)
+		ActivityFactory.create(activity_name)
 
 	def activate(self, activity_window):
 		activity_window.activate(gtk.get_current_event_time())
diff --git a/shell/sugar-activity b/shell/sugar-activity
index ca46f09..9bf9dc8 100755
--- a/shell/sugar-activity
+++ b/shell/sugar-activity
@@ -2,6 +2,6 @@
 
 import sys
 
-from sugar.activity import Activity
+from sugar.activity import ActivityFactory
 
-Activity.create(sys.argv[1])
+ActivityFactory.create(sys.argv[1])
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 99133c5..b39d229 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -6,8 +6,9 @@ import logging
 import pygtk
 pygtk.require('2.0')
 import gobject
+import gtk
 
-from sugar.activity import Activity
+from sugar.activity import ActivityFactory
 from sugar.LogWriter import LogWriter
 from sugar import theme
 
@@ -19,6 +20,8 @@ theme.setup()
 #lw.start()
 
 if len(sys.argv) == 4:
-	Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3])
+	ActivityFactory.register_factory(sys.argv[1], sys.argv[2], sys.argv[3])
 else:
-	Activity.register_factory(sys.argv[1], sys.argv[2])
+	ActivityFactory.register_factory(sys.argv[1], sys.argv[2])
+
+gtk.main()