pass the overlayer as a keyword argument for do, enter_editmode and subscribe, remove object store references

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/gtkwidgettypefilter.py b/addons/gtkwidgettypefilter.py
index 7b2e15e..01e6ad3 100644
--- a/addons/gtkwidgettypefilter.py
+++ b/addons/gtkwidgettypefilter.py
@@ -16,7 +16,6 @@
 
 from ..filters import *
 from ..properties import TStringProperty, TSequenceProperty
-from ..services import ObjectStore
 from ..gtkutils import find_widget
 
 import logging
@@ -49,12 +48,12 @@ class GtkWidgetTypeFilter(EventFilter):
         """install handlers
         @param callback default EventFilter callback arg
         """
+        if not "activity" in kwargs:
+            raise TypeError("Missing activity argument")
+
         super(GtkWidgetTypeFilter, self).install_handlers(callback, **kwargs)
         logger.debug("~~~GtkWidgetTypeFilter install")
-        activity = ObjectStore().activity
-        if activity is None:
-            logger.error("No activity")
-            raise RuntimeWarning("no activity in the objectstore")
+        activity = kwargs["activity"]
 
         self._widget = find_widget(activity, self.object_id)
         if self._widget: