From 1a65f81d10186d2f82aafb17533e6b5946761ec8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 20 Aug 2007 20:01:27 +0200
Subject: [PATCH] Set the initial palette group to "default"

---
 sugar/graphics/palette.py      |  1 +
 sugar/graphics/palettegroup.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index 1d903910..6b1209ac 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -159,6 +159,7 @@ class Palette(gtk.Window):
                      self._leave_notify_event_cb)
 
         self.set_primary_text(label, accel_path)
+        self.set_group_id('default')
 
     def is_up(self):
         return self._up
diff --git a/sugar/graphics/palettegroup.py b/sugar/graphics/palettegroup.py
index f120c405..d6ae1228 100644
--- a/sugar/graphics/palettegroup.py
+++ b/sugar/graphics/palettegroup.py
@@ -39,6 +39,7 @@ class Group(gobject.GObject):
         gobject.GObject.__init__(self)
         self._up = False
         self._palettes = []
+        self._sig_ids = {}
 
     def is_up(self):
         return self._up
@@ -46,15 +47,18 @@ class Group(gobject.GObject):
     def add(self, palette):
         self._palettes.append(palette)
 
+        self._sig_ids[palette] = []
+
         sid = palette.connect('popup', self._palette_popup_cb)
-        palette.popup_sid = sid
+        self._sig_ids[palette].append(sid)
 
         sid = palette.connect('popdown', self._palette_popdown_cb)
-        palette.podown_sid = sid
+        self._sig_ids[palette].append(sid)
 
     def remove(self, palette):
-        self.disconnect(palette.popup_sid)
-        self.disconnect(palette.popdown_sid)
+        sig_ids = self._sig_ids[palette]
+        for sid in sig_ids:
+            palette.disconnect(sid)
 
         self._palettes.remove(palette)