Disable _sugarext

3 files changed, 20 insertions, 18 deletions

diff --git a/src/sugar/graphics/iconentry.py b/src/sugar/graphics/iconentry.py
index df38b9e..6491ff1 100644
--- a/src/sugar/graphics/iconentry.py
+++ b/src/sugar/graphics/iconentry.py
@@ -17,18 +17,18 @@
 
 import gtk
 
-from sugar import _sugarext
+#from sugar import _sugarext
 
 from sugar.graphics import style
 from sugar.graphics.icon import _SVGLoader
 
-ICON_ENTRY_PRIMARY = _sugarext.ICON_ENTRY_PRIMARY
-ICON_ENTRY_SECONDARY = _sugarext.ICON_ENTRY_SECONDARY
+ICON_ENTRY_PRIMARY = 0 #_sugarext.ICON_ENTRY_PRIMARY
+ICON_ENTRY_SECONDARY = 1 #_sugarext.ICON_ENTRY_SECONDARY
 
-class IconEntry(_sugarext.IconEntry):
+class IconEntry(gtk.Entry): #_sugarext.IconEntry):
 
     def __init__(self):
-        _sugarext.IconEntry.__init__(self)
+        gtk.Entry.__init__(self)
 
         self._clear_icon = None
         self._clear_shown = False
@@ -61,10 +61,10 @@ class IconEntry(_sugarext.IconEntry):
         if image.get_storage_type() not in [gtk.IMAGE_PIXBUF, gtk.IMAGE_STOCK]:
             raise ValueError('Image must have a storage type of pixbuf or ' +
                              'stock, not %r.' % image.get_storage_type())
-        _sugarext.IconEntry.set_icon(self, position, image)
+        #_sugarext.IconEntry.set_icon(self, position, image)
 
     def remove_icon(self, position):
-        _sugarext.IconEntry.set_icon(self, position, None)
+        #_sugarext.IconEntry.set_icon(self, position, None)
 
     def add_clear_button(self):
         if self.props.text != "":
diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py
index 51b9ee4..fe2dd6b 100644
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar/graphics/palette.py
@@ -32,7 +32,7 @@ from sugar.graphics import palettegroup
 from sugar.graphics import animator
 from sugar.graphics import style
 from sugar.graphics.icon import Icon
-from sugar import _sugarext
+#from sugar import _sugarext
 
 # Helper function to find the gap position and size of widget a
 def _calculate_gap(a, b):
@@ -677,7 +677,7 @@ class PaletteActionBar(gtk.HButtonBox):
         self.pack_start(button)
         button.show()
 
-class _Menu(_sugarext.Menu):
+class _Menu(gtk.Menu):
     __gtype_name__ = 'SugarPaletteMenu'
 
     __gsignals__ = {
@@ -685,17 +685,17 @@ class _Menu(_sugarext.Menu):
     }
 
     def __init__(self, palette):
-        _sugarext.Menu.__init__(self)
+        gtk.Menu.__init__(self)
         self._palette = palette
 
     def do_insert(self, item, position):
-        _sugarext.Menu.do_insert(self, item, position)
+        gtk.Menu.do_insert(self, item, position)
         self.emit('item-inserted')
         self.show()
 
     def attach(self, child, left_attach, right_attach,
                top_attach, bottom_attach):
-        _sugarext.Menu.attach(self, child, left_attach, right_attach,
+        gtk.Menu.attach(self, child, left_attach, right_attach,
                               top_attach, bottom_attach)
         self.emit('item-inserted')
         self.show()
diff --git a/src/sugar/session.py b/src/sugar/session.py
index 0978be8..ed462af 100644
--- a/src/sugar/session.py
+++ b/src/sugar/session.py
@@ -21,21 +21,23 @@ UNSTABLE. Used only internally by jarabe.
 
 import os
 
-from sugar import _sugarext
+#from sugar import _sugarext
 
-class XSMPClient(_sugarext.SMClientXSMP):
+class XSMPClient(object): #_sugarext.SMClientXSMP):
     def __init__(self):
-        _sugarext.SMClientXSMP.__init__(self)
+        pass
+        #_sugarext.SMClientXSMP.__init__(self)
 
 class SessionManager(object):
     def __init__(self):
-        address = _sugarext.xsmp_init()
+        #address = _sugarext.xsmp_init()
         os.environ['SESSION_MANAGER'] = address
-        _sugarext.xsmp_run()
+        #_sugarext.xsmp_run()
 
-        self.session = _sugarext.session_create_global()
+        self.session = None #_sugarext.session_create_global()
 
     def start(self):
+        pass
         self.session.start()
         self.session.connect('shutdown_completed',
                              self.__shutdown_completed_cb)