Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

lib/sugar/activity/activity.py

@@ -54,6 +54,7 @@ import traceback
 
 import gtk, gobject
 import dbus
+import dbus.service
 import json
 
 from sugar import util        
@@ -872,6 +873,9 @@ class Activity(Window, gtk.Container):
         else:
             self.destroy()
 
+        # Make the exported object inaccessible
+        dbus.service.Object.remove_from_connection(self._bus)
+
     def __realize_cb(self, window):
         wm.set_bundle_id(window.window, self.get_bundle_id())
         wm.set_activity_id(window.window, str(self._activity_id))

lib/sugar/graphics/toolbutton.py

@@ -48,6 +48,9 @@ class ToolButton(gtk.ToolButton):
 
     def set_tooltip(self, text):
         self.set_palette(Palette(text))
+
+        # Set label, shows up when toolbar overflows
+        self.set_label(text)
         
     def do_expose_event(self, event):
         if self._palette and self._palette.is_up():