From a3cda7c49f0b49cce9eeca752b2785d202c40ae7 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Wed, 20 Mar 2013 15:34:13 +0000
Subject: Revert "icon.py: move all imports to the top"

We have circular imports if we do this.

This reverts commit 355ca09a8cc9ce72df908bf4c81b190ce47aa08f.
---
diff --git a/src/sugar3/graphics/icon.py b/src/sugar3/graphics/icon.py
index 68d6f30..a554324 100644
--- a/src/sugar3/graphics/icon.py
+++ b/src/sugar3/graphics/icon.py
@@ -34,9 +34,6 @@ import cairo
 
 from sugar3.graphics import style
 from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.palette import CursorInvoker
-from sugar3.graphics.palette import Palette
-from sugar3.graphics.palette import CellRendererInvoker
 from sugar3.util import LRU
 
 _BADGE_SIZE = 0.45
@@ -500,6 +497,7 @@ class EventIcon(Gtk.EventBox):
         for key, value in kwargs.iteritems():
             self.set_property(key, value)
 
+        from sugar3.graphics.palette import CursorInvoker
         self._palette_invoker = CursorInvoker()
         self._palette_invoker.attach(self)
         self.connect('destroy', self.__destroy_cb)
@@ -679,6 +677,8 @@ class EventIcon(Gtk.EventBox):
         type=object, setter=set_palette_invoker, getter=get_palette_invoker)
 
     def set_tooltip(self, text):
+        from sugar3.graphics.palette import Palette
+
         self.set_palette(Palette(text))
 
 
@@ -750,6 +750,8 @@ class CellRendererIcon(Gtk.CellRenderer):
     }
 
     def __init__(self, tree_view):
+        from sugar3.graphics.palette import CellRendererInvoker
+
         self._buffer = _IconBuffer()
         self._buffer.cache = True
         self._xo_color = None
--
cgit v0.9.1