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

This commit is contained in:
Marco Pesenti Gritti 2007-07-24 11:46:14 +02:00
commit 3e40075a80
2 changed files with 6 additions and 3 deletions
shell/view
sugar/graphics

View File

@ -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)

View File

@ -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(),