Adapt to the new activityfactory interface.

3 files changed, 8 insertions, 5 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