diff options
| -rw-r--r-- | src/sugar/graphics/icon.py | 2 | ||||
| -rw-r--r-- | src/sugar/graphics/palette.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py index 346a2d0..94c66aa 100644 --- a/src/sugar/graphics/icon.py +++ b/src/sugar/graphics/icon.py @@ -943,8 +943,6 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem): self.set_palette(Palette(text)) - palette = property(get_palette, set_palette) - class CellRendererIcon(gtk.GenericCellRenderer): diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py index f89f260..bb2b605 100644 --- a/src/sugar/graphics/palette.py +++ b/src/sugar/graphics/palette.py @@ -209,9 +209,10 @@ class Palette(PaletteWindow): def _popdown_submenus(self): # TODO explicit hiding of subitems # should be removed after fixing #1301 - for menu_item in self.menu.get_children(): - if menu_item.props.submenu is not None: - menu_item.props.submenu.popdown() + if self.menu is not None: + for menu_item in self.menu.get_children(): + if menu_item.props.submenu is not None: + menu_item.props.submenu.popdown() def on_enter(self, event): PaletteWindow.on_enter(self, event) |