From cc7ce17eb7061656d2ae005eab98869e147eb08c Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Wed, 4 Jun 2008 22:26:40 +0200 Subject: [PATCH 1/2] Fix the setup.py dev --- src/sugar/activity/bundlebuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py index 7a89ab45..65a4d1b7 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py @@ -168,7 +168,7 @@ def cmd_dev(config, options, args): bundle_path = env.get_user_activities_path() if not os.path.isdir(bundle_path): os.mkdir(bundle_path) - bundle_path = os.path.join(bundle_path, config.bundle_top_dir) + bundle_path = os.path.join(bundle_path, config.bundle_root_dir) try: os.symlink(config.source_dir, bundle_path) except OSError: From a935d5af971d1b585be39242ddca6933a858e1fa Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Thu, 5 Jun 2008 10:31:30 +0200 Subject: [PATCH 2/2] initialize right_click_invoker_hid in palette --- src/sugar/graphics/palette.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py index 12774770..79f5e86b 100644 --- a/src/sugar/graphics/palette.py +++ b/src/sugar/graphics/palette.py @@ -246,6 +246,7 @@ class Palette(gtk.Window): self._palette_popup_sid = None self._enter_invoker_hid = None self._leave_invoker_hid = None + self._right_click_invoker_hid = None # we set these for backward compatibility if label is not None: