Adapt to the new activityfactory interface.

6 files changed, 37 insertions, 28 deletions

diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 1cedda7..aa8de05 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -180,6 +180,7 @@ class ActivityEntry(hippo.CanvasBox, hippo.CanvasItem):
         registry = bundleregistry.get_registry()
         registry.connect('bundle-changed', self.__activity_changed_cb)
 
+        self._bundle = activity_info
         self._bundle_id = activity_info.get_bundle_id()
         self._version = activity_info.get_activity_version()
         self._favorite = registry.is_bundle_favorite(self._bundle_id,
@@ -245,7 +246,7 @@ class ActivityEntry(hippo.CanvasBox, hippo.CanvasItem):
             self._favorite_icon.props.favorite = self._favorite
 
     def __icon_button_release_event_cb(self, icon, event):
-        activityfactory.create(self._bundle_id)
+        activityfactory.create(self._bundle)
 
     def get_bundle_id(self):
         return self._bundle_id
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 3bf4964..75a6de6 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -354,7 +354,7 @@ class ActivityIcon(CanvasIcon):
         self.palette.popdown(immediate=True)
         self._uncolor()
 
-        activityfactory.create(self._activity_info.get_bundle_id())
+        activityfactory.create(self._activity_info)
 
     def get_bundle_id(self):
         return self._activity_info.get_bundle_id()
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 4dbc9de..8f0587b 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -39,7 +39,7 @@ 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.model import bundleregistry
 from jarabe.model.network import NM_802_11_CAP_PROTO_WEP, \
     NM_802_11_CAP_PROTO_WPA, NM_802_11_CAP_PROTO_WPA2
 
@@ -337,7 +337,9 @@ class ActivityView(hippo.CanvasBox):
         bundle_id = self._model.get_bundle_id()
 
         handle = ActivityHandle(self._model.get_id())
-        activityfactory.create(bundle_id, handle)
+
+        bundle = bundleregistry.get_registry().get_bundle(bundle_id)
+        activityfactory.create(bundle, handle)
 
     def set_filter(self, query):
         text_to_check = self._model.activity.props.name.lower() + \
@@ -365,7 +367,7 @@ class ActivityView(hippo.CanvasBox):
         self._update_palette()
 
     def _joined_changed_cb(self, widget, event):
-        logging.debug('ActivityView._joined_changed_cb: AAAA!!!!')
+        logging.debug('ActivityView._joined_changed_cb')
 
 _AUTOSEARCH_TIMEOUT = 1000
 
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index dfeeced..63dd327 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -151,8 +151,11 @@ class ActivityInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Join the activity in the invite."""
+        registry = bundleregistry.get_registry()
+        bundle = registry.get_bundle(self._bundle_id)
+
         handle = ActivityHandle(self._activity_model.get_id())
-        activityfactory.create(self._activity_model.get_bundle_id(), handle)
+        activityfactory.create(bundle, handle)
 
 class PrivateInviteButton(BaseInviteButton):
     """Invite to a private one to one channel"""
@@ -163,9 +166,10 @@ class PrivateInviteButton(BaseInviteButton):
 
         self._icon.props.xo_color = profile.get_color()
         registry = bundleregistry.get_registry()
-        activity_info = registry.get_bundle(self._bundle_id)
-        if activity_info:
-            self._icon.props.file = activity_info.get_icon()
+        self._bundle = registry.get_bundle(self._bundle_id)
+
+        if self._bundle:
+            self._icon.props.file = self._bundle.get_icon()
         else:
             self._icon.props.icon_name = 'image-missing'
         self.set_icon_widget(self._icon)
@@ -177,10 +181,9 @@ class PrivateInviteButton(BaseInviteButton):
         self.set_palette(palette)
 
         self._notif_icon.props.xo_color = profile.get_color()
-        registry = bundleregistry.get_registry()
-        activity_info = registry.get_bundle(self._bundle_id)
-        if activity_info:
-            self._notif_icon.props.icon_filename = activity_info.get_icon()
+
+        if self._bundle:
+            self._notif_icon.props.icon_filename = self._bundle.get_icon()
         else:
             self._notif_icon.props.icon_name = 'image-missing'
 
@@ -195,7 +198,7 @@ class PrivateInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Start the activity with private channel."""
-        activityfactory.create_with_uri(self._bundle_id, self._private_channel)
+        activityfactory.create_with_uri(self._bundle, self._private_channel)
 
 class BaseInvitePalette(Palette):
     """Palette for frame or notification icon for invites."""
@@ -237,15 +240,15 @@ class ActivityInvitePalette(BaseInvitePalette):
         self._bundle_id = activity_model.get_bundle_id()
 
         registry = bundleregistry.get_registry()
-        activity_info = registry.get_bundle(self._bundle_id)
-        if activity_info:
-            self.set_primary_text(activity_info.get_name())
+        self._bundle = registry.get_bundle(self._bundle_id)
+        if self._bundle:
+            self.set_primary_text(self._bundle.get_name())
         else:
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
         handle = ActivityHandle(self._activity_model.get_id())
-        activityfactory.create(self._activity_model.get_bundle_id(), handle)
+        activityfactory.create(self._bundle, handle)
 
     def _decline(self):
         invites = owner.get_model().get_invites()
@@ -263,14 +266,14 @@ class PrivateInvitePalette(BaseInvitePalette):
         self._bundle_id = invite.get_bundle_id()
 
         registry = bundleregistry.get_registry()
-        activity_info = registry.get_bundle(self._bundle_id)
-        if activity_info:
-            self.set_primary_text(activity_info.get_name())
+        self._bundle = registry.get_bundle(self._bundle_id)
+        if self._bundle:
+            self.set_primary_text(self._bundle.get_name())
         else:
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        activityfactory.create_with_uri(self._bundle_id, self._private_channel)
+        activityfactory.create_with_uri(self._bundle, self._private_channel)
 
         invites = owner.get_model().get_invites()
         invites.remove_private_channel(self._private_channel)
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 3fa8bd7..d2085ff 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -151,7 +151,7 @@ def resume(jobject, bundle_id=None):
 
         logging.debug('activityfactory.creating bundle with id %r',
                         bundle.get_bundle_id())
-        activityfactory.create(bundle.get_bundle_id())
+        activityfactory.create(bundle)
 
     elif jobject.is_content_bundle() and not bundle_id:
 
@@ -168,8 +168,9 @@ def resume(jobject, bundle_id=None):
 
         uri = bundle.get_start_uri()
         logging.debug('activityfactory.creating with uri %s', uri)
-        activityfactory.create_with_uri(activities[0].bundle_id,
-                                        bundle.get_start_uri())
+
+        activity_bundle = registry.get_bundle(activities[0].bundle_id)
+        activityfactory.create_with_uri(activity_bundle, bundle.get_start_uri())
     else:
         if not get_activities(jobject) and bundle_id is None:
             logging.warning('No activity can open this object, %s.' %
@@ -177,6 +178,7 @@ def resume(jobject, bundle_id=None):
             return
         if bundle_id is None:
             bundle_id = get_activities(jobject)[0].bundle_id
+            bundle = registry.get_bundle(bundle_id)
 
         activity_id = jobject.metadata['activity_id']
         object_id = jobject.object_id
@@ -184,7 +186,7 @@ def resume(jobject, bundle_id=None):
         if activity_id:
             handle = ActivityHandle(object_id=object_id,
                                     activity_id=activity_id)
-            activityfactory.create(bundle_id, handle)
+            activityfactory.create(bundle, handle)
         else:
-            activityfactory.create_with_object_id(bundle_id, object_id)
+            activityfactory.create_with_object_id(bundle, object_id)
 
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 2a0bc86..72326c4 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -99,6 +99,7 @@ class ActivityPalette(Palette):
 
         registry = bundleregistry.get_registry()
 
+        self._bundle = activity_info
         self._bundle_id = activity_info.get_bundle_id()
         self._version = activity_info.get_activity_version()
         self._favorite = registry.is_bundle_favorite(self._bundle_id,
@@ -148,7 +149,7 @@ class ActivityPalette(Palette):
         self._favorite_icon.props.xo_color = xo_color
 
     def __start_activate_cb(self, menu_item):
-        activityfactory.create(self._bundle_id)
+        activityfactory.create(self._bundle)
 
     def __change_favorite_activate_cb(self, menu_item):
         registry = bundleregistry.get_registry()