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

3 files changed, 9 insertions, 1 deletions

diff --git a/lib/sugar/graphics/icon.py b/lib/sugar/graphics/icon.py
index cbff3f9..f215081 100644
--- a/lib/sugar/graphics/icon.py
+++ b/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)
diff --git a/lib/sugar/graphics/iconentry.py b/lib/sugar/graphics/iconentry.py
index 83bc864..5bd8714 100644
--- a/lib/sugar/graphics/iconentry.py
+++ b/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)
diff --git a/lib/sugar/graphics/toolbox.py b/lib/sugar/graphics/toolbox.py
index e4e831a..4171d00 100644
--- a/lib/sugar/graphics/toolbox.py
+++ b/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)
+