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

1 files changed, 9 insertions, 10 deletions

diff --git a/addons/disablewidget.py b/addons/disablewidget.py
index 15e07f2..3d392e9 100644
--- a/addons/disablewidget.py
+++ b/addons/disablewidget.py
@@ -16,7 +16,6 @@
 
 from ..actions import *
 from .. import gtkutils
-from ..services import ObjectStore
 
 class DisableWidgetAction(Action):
     target = TStringProperty("0")
@@ -31,15 +30,15 @@ class DisableWidgetAction(Action):
 
     def do(self, **kwargs):
         """Action do"""
-        os = ObjectStore()
-        if os.activity:
-            self._widget = gtkutils.find_widget(os.activity, self.target)
-            if self._widget:
-                # If we have an object whose sensitivity we can query, we will
-                # keep it to reset it in the undo() method  
-                if hasattr(self._widget, 'get_sensitive') and callable(self._widget.get_sensitive):
-                    self._previous_sensitivity = self._widget.get_sensitive()
-                self._widget.set_sensitive(False)
+        if not "activity" in kwargs:
+            raise TypeError("Missing activity")
+        self._widget = gtkutils.find_widget(kwargs["activity"], self.target)
+        if self._widget:
+            # If we have an object whose sensitivity we can query, we will
+            # keep it to reset it in the undo() method  
+            if hasattr(self._widget, 'get_sensitive') and callable(self._widget.get_sensitive):
+                self._previous_sensitivity = self._widget.get_sensitive()
+            self._widget.set_sensitive(False)
                        
     def undo(self):    
         """Action undo"""