Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

lib/sugar/graphics/icon.py

@@ -130,6 +130,8 @@ class _IconBuffer(object):
                 icon_info.file_name = info.get_filename()
                 icon_info.attach_x = attach_x
                 icon_info.attach_y = attach_y
+
+                del info
             else:
                 logging.warning('No icon with the name %s '
                                 'was found in the theme.' % self.icon_name)

lib/sugar/graphics/iconentry.py

@@ -28,8 +28,8 @@ class IconEntry(_sugarext.IconEntry):
         icon_info = icon_theme.lookup_icon(name,
                                            gtk.ICON_SIZE_SMALL_TOOLBAR,
                                            0)
-
         pixbuf = gtk.gdk.pixbuf_new_from_file(icon_info.get_filename())
+        del icon_info
 
         image = gtk.Image()
         image.set_from_pixbuf(pixbuf)

lib/sugar/graphics/toolbox.py

@@ -89,3 +89,9 @@ class Toolbox(gtk.VBox):
 
     def set_current_toolbar(self, index):
         self._notebook.set_current_page(index)
+
+    def get_current_toolbar(self):
+        return self._notebook.get_current_page()
+    
+    current_toolbar = property(get_current_toolbar, set_current_toolbar)
+

services/shell/sugar-shell-service

@@ -25,6 +25,7 @@ import logging
 import gobject
 import dbus.glib
  
+from sugar import logger
 from sugar import env
 
 sys.path.append(env.get_service_path('shell'))
@@ -32,6 +33,7 @@ sys.path.append(env.get_service_path('shell'))
 import clipboardservice
 import activityregistryservice
 
+logger.start('shellservice')
 logging.info('Starting shell service.')
 
 gobject.threads_init()