diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-05 11:39:04 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-05 11:39:04 (GMT) |
| commit | 285509c8c9446d222220853860a9091b3794033f (patch) | |
| tree | ea77f3119da219a5f3767c90ad4688165ba2d726 /src | |
| parent | 7302690aa12ea6021a1daef487c1647ff8eaf303 (diff) | |
| parent | a935d5af971d1b585be39242ddca6933a858e1fa (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit
Diffstat (limited to 'src')
| -rw-r--r-- | src/sugar/activity/bundlebuilder.py | 2 | ||||
| -rw-r--r-- | src/sugar/graphics/palette.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py index b356e39..bf21085 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: diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py index 1277477..79f5e86 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: |