From 21daa86bcb386240a1902c0bbad960285c900bcf Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Sun, 06 Dec 2009 20:07:51 +0000
Subject: Merge branch 'frame_integration'

Conflicts:
	tutorius/overlayer.py
---
(limited to 'addons')

diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index 7e91d00..53387bf 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -76,6 +76,7 @@ class BubbleMessage(Action):
             Destroy the dialog
         """
         if self._bubble:
+            self.overlay.remove(self._bubble)
             self._bubble.destroy()
             self._bubble = None
 
diff --git a/addons/bubblemessagewimg.py b/addons/bubblemessagewimg.py
index 0ad444f..514a311 100644
--- a/addons/bubblemessagewimg.py
+++ b/addons/bubblemessagewimg.py
@@ -79,6 +79,7 @@ class BubbleMessageWImg(Action):
             Destroy the dialog
         """
         if self._bubble:
+            self.overlay.remove(self._bubble)
             self._bubble.destroy()
             self._bubble = None
 
diff --git a/addons/changecolor.py b/addons/changecolor.py
index 460da32..eac891a 100644
--- a/addons/changecolor.py
+++ b/addons/changecolor.py
@@ -63,9 +63,14 @@ class ChangeColor(Action):
         
         if not "activity" in kwargs:
             raise TypeError("activity argument is Mandatory")
+        activity = kwargs["activity"]
+
+        if not "probe" in kwargs:
+            raise TypeError("probe argument is Mandatory")
+        probe = kwargs["probe"]
         
         # get widget instance
-        self.wid = find_widget(kwargs["activity"], self.widaddr, ignore_errors=False)
+        self.wid = probe.find_widget(activity, self.widaddr, ignore_errors=False)
     
         if not self.wid:
             raise NameError("widget not found")
diff --git a/addons/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py
index ac14399..f6ecf86 100644
--- a/addons/gtkwidgeteventfilter.py
+++ b/addons/gtkwidgeteventfilter.py
@@ -45,9 +45,14 @@ class GtkWidgetEventFilter(EventFilter):
         super(GtkWidgetEventFilter, self).install_handlers(callback, **kwargs)
         if not "activity" in kwargs:
             raise TypeError("activity argument is Mandatory")
-        
+        activity = kwargs["activity"]
+
+        if not "probe" in kwargs:
+            raise TypeError("probe argument is Mandatory")
+        probe = kwargs["probe"]
+
         #find the widget and connect to its event
-        self._widget = find_widget(kwargs["activity"], self.object_id)
+        self._widget = probe.find_widget(activity, self.object_id)
         self._handler_id = self._widget.connect( \
                         self.event_name, self.do_callback )
 
--
cgit v0.9.1