Fix that several palettes are not hooked up to the same button #3293

1 files changed, 9 insertions, 2 deletions

diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index 8f2a404..acc14f7 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -192,9 +192,16 @@ class Palette(gtk.Window):
 
     def do_set_property(self, pspec, value):
         if pspec.name == 'invoker':
+            if self._invoker is not None:
+                self._invoker.disconnect(self._enter_invoker_hid)
+                self._invoker.disconnect(self._leave_invoker_hid)                                
+
             self._invoker = value
-            self._invoker.connect('mouse-enter', self._invoker_mouse_enter_cb)
-            self._invoker.connect('mouse-leave', self._invoker_mouse_leave_cb)
+            if value is not None:
+                self._enter_invoker_hid = self._invoker.connect(
+                    'mouse-enter', self._invoker_mouse_enter_cb)
+                self._leave_invoker_hid = self._invoker.connect(
+                    'mouse-leave', self._invoker_mouse_leave_cb)
         else:
             raise AssertionError