Fix caps

shell/sugar-activity

@@ -20,7 +20,7 @@ import sys
 import os
 import gobject
 
-from sugar.activity import ActivityFactory
+from sugar.activity import activityfactory
 from sugar import env
 from sugar import util
 
@@ -40,7 +40,7 @@ os.environ['DBUS_SESSION_BUS_ADDRESS'] = bus_name
 
 loop = gobject.MainLoop()
 
-handler = ActivityFactory.create(sys.argv[1])
+handler = activityfactory.create(sys.argv[1])
 handler.connect('success', _success_cb, loop)
 handler.connect('error', _error_cb, loop)
 

shell/view/Shell.py

@@ -23,7 +23,7 @@ from view.home.HomeWindow import HomeWindow
 from sugar.presence import PresenceService
 from sugar.graphics.popupcontext import PopupContext
 from view.ActivityHost import ActivityHost
-from sugar.activity import ActivityFactory
+from sugar.activity import activityfactory
 from view.frame.frame import Frame
 from view.keyhandler import KeyHandler
 from view.hardwaremanager import HardwareManager
@@ -137,7 +137,7 @@ class Shell(gobject.GObject):
         home_model = self._model.get_home()
         home_model.notify_activity_launch(activity_id, act_type)
 
-        handler = ActivityFactory.create(act_type)
+        handler = activityfactory.create(act_type)
         handler.connect('success', self._join_success_cb, activity_ps, activity_id, act_type)
         handler.connect('error', self._join_error_cb, home_model, activity_id, act_type)
 
@@ -190,7 +190,7 @@ class Shell(gobject.GObject):
         home_model.notify_activity_launch(act_id, activity_type)
 
         logging.debug("Shell.start_activity will start %s (%s)" % (act_id, activity_type))
-        handler = ActivityFactory.create(activity_type)
+        handler = activityfactory.create(activity_type)
         handler.connect('success', self._start_success_cb, act_id, activity_type)
         handler.connect('error', self._start_error_cb, home_model, act_id, activity_type)
 

shell/view/clipboardicon.py

@@ -3,7 +3,7 @@ import logging
 from sugar.graphics.menuicon import MenuIcon
 from view.clipboardmenu import ClipboardMenu
 from sugar.graphics.iconcolor import IconColor
-from sugar.activity import ActivityFactory
+from sugar.activity import activityfactory
 from sugar.clipboard import clipboardservice
 from sugar import util
 
@@ -53,7 +53,7 @@ class ClipboardIcon(MenuIcon):
         logging.debug("_icon_activated_cb: " + self._object_id)
 
         # Launch the activity to handle this item
-        handler = ActivityFactory.create(self._activity)
+        handler = activityfactory.create(self._activity)
         handler.connect('success', self._activity_create_success_cb)
         handler.connect('error', self._activity_create_error_cb)
 

sugar/activity/Makefile.am

@@ -2,7 +2,7 @@ sugardir = $(pythondir)/sugar/activity
 sugar_PYTHON =				\
 	__init__.py			\
 	Activity.py			\
-	ActivityFactory.py		\
+	activityfactory.py		\
 	activityfactoryservice.py	\
 	activityservice.py		\
 	bundle.py			\