.get_parent() fixes

2 files changed, 9 insertions, 7 deletions

diff --git a/src/sugar3/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py
index 6bbf110..7bbd885 100644
--- a/src/sugar3/graphics/toolbarbox.py
+++ b/src/sugar3/graphics/toolbarbox.py
@@ -39,16 +39,18 @@ class ToolbarButton(ToolButton):
         self.connect('hierarchy-changed', self.__hierarchy_changed_cb)
 
     def __hierarchy_changed_cb(self, tool_button, previous_toplevel):
-        if hasattr(self.parent, 'owner'):
+        parent = self.get_parent()
+        if hasattr(parent, 'owner'):
             if self.page_widget and previous_toplevel is None:
                 self._unparent()
-                self.parent.owner.pack_start(self.page_widget, True, True, 0)
+                parent.owner.pack_start(self.page_widget, True, True, 0)
                 self.set_expanded(False)
 
     def get_toolbar_box(self):
-        if not hasattr(self.parent, 'owner'):
-            return None
-        return self.parent.owner
+        parent = self.get_parent()
+        if not hasattr(parent, 'owner'):
+            return parent.owner
+
 
     toolbar_box = property(get_toolbar_box)
 
@@ -72,7 +74,7 @@ class ToolbarButton(ToolButton):
 
     def is_in_palette(self):
         return self.page is not None and \
-                self.page_widget.parent == self.props.palette
+                self.page_widget.get_parent() == self.props.palette
 
     def is_expanded(self):
         return self.page is not None and \
diff --git a/src/sugar3/graphics/tray.py b/src/sugar3/graphics/tray.py
index 42d0950..fcd2d24 100644
--- a/src/sugar3/graphics/tray.py
+++ b/src/sugar3/graphics/tray.py
@@ -409,7 +409,7 @@ class _IconWidget(Gtk.EventBox):
         self._icon.show()
 
     def do_expose_event(self, event):
-        palette = self.parent.palette
+        palette = self.get_parent().palette
         if palette and palette.is_up():
             invoker = palette.props.invoker
             invoker.draw_rectangle(event, palette)