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

shell/view/Shell.py

@@ -209,8 +209,8 @@ class Shell(gobject.GObject):
                 jobject.file_path = file_path
                 datastore.write(jobject)
             finally:
-                datastore.destroy()
-                del datastore
+                jobject.destroy()
+                del jobject
         finally:
             os.remove(file_path)
 

sugar/graphics/objectchooser.py

@@ -116,8 +116,11 @@ class CollapsedEntry(Frame):
         self.append(date)
 
         icon = CanvasIcon(icon_name=self._get_icon_name(),
-                          xo_color=XoColor(self.jobject.metadata['icon-color']),
                           box_width=units.grid_to_pixels(1))
+
+        if self.jobject.metadata.has_key('icon-color'):
+            icon.props.xo_color = XoColor(self.jobject.metadata['icon-color'])
+
         self.append(icon)
         
         title = hippo.CanvasText(text=self._format_title(),