diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-02-04 18:05:39 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-02-04 18:05:39 (GMT) |
| commit | b3cc0bec550378fa5eb9b6b2983defdd1037be78 (patch) | |
| tree | 53c3e6f812103db702230d9c9908caa3419ac149 /lib | |
| parent | 33ae2dc5487a00a89a18fd0eae39258f818b8868 (diff) | |
| parent | e50e9d6a9f7f65fa9d8c899b1f77a944a076435e (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sugar/activity/activity.py | 4 | ||||
| -rw-r--r-- | lib/sugar/graphics/toolbutton.py | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/sugar/activity/activity.py b/lib/sugar/activity/activity.py index f6dbd37..9d87e9e 100644 --- a/lib/sugar/activity/activity.py +++ b/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)) diff --git a/lib/sugar/graphics/toolbutton.py b/lib/sugar/graphics/toolbutton.py index b4c8eb3..26acc83 100644 --- a/lib/sugar/graphics/toolbutton.py +++ b/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(): |