From eeb1f2e66f7d9864f991487857b70ece879c4ae9 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 24 Jul 2007 11:11:22 +0200 Subject: [PATCH 1/2] #2364: Fix uploads. --- sugar/graphics/objectchooser.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sugar/graphics/objectchooser.py b/sugar/graphics/objectchooser.py index 0d42a7af..aea83156 100644 --- a/sugar/graphics/objectchooser.py +++ b/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(), From b886121c100d314b7c098d92e10c5a7068fd1070 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 24 Jul 2007 11:14:52 +0200 Subject: [PATCH 2/2] Typo. --- shell/view/Shell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 777c10c4..697dc1c8 100644 --- a/shell/view/Shell.py +++ b/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)