From 9aab382e59adf0fb9af2725707d3eaaf0a3ae7ec Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 20 Nov 2009 16:16:16 +0000
Subject: CartoonBuilder fails to launch #1569

---
(limited to 'utils.py')

diff --git a/utils.py b/utils.py
index 4dca530..fdf7e95 100644
--- a/utils.py
+++ b/utils.py
@@ -15,15 +15,16 @@
 import gtk
 import pango
 
-import sugar
 from sugar.graphics import style
 from sugar.graphics.icon import Icon
+from sugar.graphics.icon import Icon
+from sugar.graphics.combobox import ComboBox as _ComboBox
 
 from theme import *
 
-class ComboBox(sugar.graphics.combobox.ComboBox):
+class ComboBox(_ComboBox):
     def __init__(self):
-        sugar.graphics.combobox.ComboBox.__init__(self)
+        _ComboBox.__init__(self)
         self.set_name('we-really-need-it-to-use-custom-combobox-colors')
 
     def append_item(self, action_id, text = None, icon_name = None, size = None,
@@ -33,7 +34,8 @@ class ComboBox(sugar.graphics.combobox.ComboBox):
             self._icon_renderer = gtk.CellRendererPixbuf()
 
             settings = self.get_settings()
-            w, h = gtk.icon_size_lookup_for_settings(settings, gtk.ICON_SIZE_MENU)
+            w, h = gtk.icon_size_lookup_for_settings(settings,
+                    gtk.ICON_SIZE_MENU)
             self._icon_renderer.props.stock_size = w
 
             self._icon_renderer.props.xpad = 4
--
cgit v0.9.1