From 285509c8c9446d222220853860a9091b3794033f Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 05 Jun 2008 11:39:04 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit

---
(limited to 'src')

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:
--
cgit v0.9.1