Remove (now) pointless activity launch wrappers from the shell view.

5 files changed, 19 insertions, 47 deletions

diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index e163b06..072a295 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -23,8 +23,8 @@ from sugar import activity
 from sugar import util
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
+from sugar.activity import activityfactory
 
-from jarabe.view import shell
 from jarabe.view.palettes import ActivityPalette
 
 class ActivitiesList(gtk.VBox):
@@ -248,7 +248,7 @@ class ActivityEntry(hippo.CanvasBox, hippo.CanvasItem):
             self._favorite_icon.props.favorite = self._favorite
 
     def __icon_button_release_event_cb(self, icon, event):
-        shell.get_instance().start_activity(self._bundle_id)
+        activityfactory.create(self._bundle_id)
 
     def get_bundle_id(self):
         return self._bundle_id
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index d0284ba..007fc38 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -29,8 +29,8 @@ from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.alert import Alert
 from sugar.profile import get_profile
 from sugar import activity
+from sugar.activity import activityfactory
 
-from jarabe.view import shell as shellview
 from jarabe.view.palettes import JournalPalette
 from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette
 from jarabe.model import shell
@@ -350,7 +350,8 @@ class ActivityIcon(CanvasIcon):
     def __button_release_event_cb(self, icon, event):
         self.palette.popdown(immediate=True)
         self._uncolor()
-        shellview.get_instance().start_activity(self._activity_info.bundle_id)
+
+        activityfactory.create(self._activity_info.bundle_id)
 
     def get_bundle_id(self):
         return self._activity_info.bundle_id
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 5b25e05..4dbc9de 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -28,6 +28,8 @@ from sugar.graphics.icon import get_icon_state
 from sugar.graphics import palette
 from sugar.graphics import iconentry
 from sugar.graphics.menuitem import MenuItem
+from sugar.activity.activityhandle import ActivityHandle
+from sugar.activity import activityfactory
 from sugar import profile
 
 from jarabe.model import accesspoint
@@ -37,7 +39,6 @@ from jarabe.view.buddyicon import BuddyIcon
 from jarabe.view.pulsingicon import CanvasPulsingIcon
 from jarabe.desktop.snowflakelayout import SnowflakeLayout
 from jarabe.desktop.spreadlayout import SpreadLayout
-from jarabe.view import shell
 
 from jarabe.model.network import NM_802_11_CAP_PROTO_WEP, \
     NM_802_11_CAP_PROTO_WPA, NM_802_11_CAP_PROTO_WPA2
@@ -334,7 +335,9 @@ class ActivityView(hippo.CanvasBox):
 
     def _clicked_cb(self, item):
         bundle_id = self._model.get_bundle_id()
-        shell.get_instance().join_activity(bundle_id, self._model.get_id())
+
+        handle = ActivityHandle(self._model.get_id())
+        activityfactory.create(bundle_id, handle)
 
     def set_filter(self, query):
         text_to_check = self._model.activity.props.name.lower() + \
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index 8211265..f786654 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -27,6 +27,8 @@ from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.icon import Icon
 from sugar.graphics.palette import Palette, WidgetInvoker
 from sugar.graphics.menuitem import MenuItem
+from sugar.activity.activityhandle import ActivityHandle
+from sugar.activity import activityfactory
 from sugar import activity
 from sugar import profile
 
@@ -37,7 +39,6 @@ from jarabe.view.palettes import JournalPalette, CurrentActivityPalette
 from jarabe.view.pulsingicon import PulsingIcon
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.frame.notification import NotificationIcon
-from jarabe.view import shell as shellview
 import jarabe.frame.frame
 
 class ActivityButton(RadioToolButton):
@@ -150,10 +151,8 @@ class ActivityInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Join the activity in the invite."""
-        shell_inst = shellview.get_instance()
-        shell_inst.join_activity(self._activity_model.get_bundle_id(),
-                                 self._activity_model.get_id())
-
+        handle = ActivityHandle(self._activity_model.get_id())
+        activityfactory.create(self._activity_model.get_bundle_id(), handle)
 
 class PrivateInviteButton(BaseInviteButton):
     """Invite to a private one to one channel"""
@@ -196,10 +195,7 @@ class PrivateInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Start the activity with private channel."""
-        shell_inst = shellview.get_instance()
-        shell_inst.start_activity_with_uri(self._bundle_id,
-                                           self._private_channel)
-
+        activityfactory.create_with_uri(self._bundle_id, self._private_channel)
 
 class BaseInvitePalette(Palette):
     """Palette for frame or notification icon for invites."""
@@ -248,9 +244,8 @@ class ActivityInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell_inst = shellview.get_instance()
-        shell_inst.join_activity(self._activity_model.get_bundle_id(),
-                                 self._activity_model.get_id())
+        handle = ActivityHandle(self._activity_model.get_id())
+        activityfactory.create(self._activity_model.get_bundle_id(), handle)
 
     def _decline(self):
         invites = owner.get_model().get_invites()
@@ -275,9 +270,8 @@ class PrivateInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell_inst = shellview.get_instance()
-        shell_inst.start_activity_with_uri(self._bundle_id,
-                                           self._private_channel)
+        activityfactory.create_with_uri(self._bundle_id, self._private_channel)
+
         invites = owner.get_model().get_invites()
         invites.remove_private_channel(self._private_channel)
 
diff --git a/src/jarabe/view/shell.py b/src/jarabe/view/shell.py
index 58a41bb..9486070 100644
--- a/src/jarabe/view/shell.py
+++ b/src/jarabe/view/shell.py
@@ -20,10 +20,6 @@ import gobject
 import gtk
 import wnck
 
-from sugar.activity.activityhandle import ActivityHandle
-from sugar import activity
-from sugar.activity import activityfactory
-
 from jarabe.view.launchwindow import LaunchWindow
 from jarabe.model import shell
 
@@ -80,28 +76,6 @@ class Shell(gobject.GObject):
     def get_frame(self):
         return self._frame
 
-    def join_activity(self, bundle_id, activity_id):
-        activity_model = self._model.get_activity_by_id(activity_id)
-        activity_model.get_window().activate(gtk.get_current_event_time())
-
-        # Get the service name for this activity, if
-        # we have a bundle on the system capable of handling
-        # this activity type
-        registry = activity.get_registry()
-        bundle = registry.get_activity(bundle_id)
-        if not bundle:
-            logging.error("Couldn't find activity for type %s" % bundle_id)
-            return
-
-        handle = ActivityHandle(activity_id)
-        activityfactory.create(bundle_id, handle)
-
-    def start_activity(self, activity_type):
-        activityfactory.create(activity_type)
-
-    def start_activity_with_uri(self, activity_type, uri):
-        activityfactory.create_with_uri(activity_type, uri)
-
     def set_zoom_level(self, level):
         if level == self._model.get_zoom_level():
             logging.debug('Already in the level %r' % level)