Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
commit
3e40075a80
@ -209,8 +209,8 @@ class Shell(gobject.GObject):
|
|||||||
jobject.file_path = file_path
|
jobject.file_path = file_path
|
||||||
datastore.write(jobject)
|
datastore.write(jobject)
|
||||||
finally:
|
finally:
|
||||||
datastore.destroy()
|
jobject.destroy()
|
||||||
del datastore
|
del jobject
|
||||||
finally:
|
finally:
|
||||||
os.remove(file_path)
|
os.remove(file_path)
|
||||||
|
|
||||||
|
@ -116,8 +116,11 @@ class CollapsedEntry(Frame):
|
|||||||
self.append(date)
|
self.append(date)
|
||||||
|
|
||||||
icon = CanvasIcon(icon_name=self._get_icon_name(),
|
icon = CanvasIcon(icon_name=self._get_icon_name(),
|
||||||
xo_color=XoColor(self.jobject.metadata['icon-color']),
|
|
||||||
box_width=units.grid_to_pixels(1))
|
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)
|
self.append(icon)
|
||||||
|
|
||||||
title = hippo.CanvasText(text=self._format_title(),
|
title = hippo.CanvasText(text=self._format_title(),
|
||||||
|
Loading…
Reference in New Issue
Block a user