From a41016fe14ea10d6a01f48cde847ce7431f2b547 Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Mon, 25 Aug 2008 14:05:14 +0000
Subject: Merge branch 'sucrose-0.82' of git+ssh://dev.laptop.org/git/sugar-toolkit into sucrose-0.82

---
diff --git a/src/sugar/graphics/alert.py b/src/sugar/graphics/alert.py
index a4d2a5a..39c373c 100644
--- a/src/sugar/graphics/alert.py
+++ b/src/sugar/graphics/alert.py
@@ -105,9 +105,6 @@ class Alert(gtk.EventBox):
             if self._msg != value:
                 self._msg = value
                 self._msg_label.set_markup(self._msg)
-                width, height_ = self._msg_label.size_request()
-                self._msg_label.set_size_request(width-style.DEFAULT_SPACING, 
-                                                 -1)
                 self._msg_label.set_line_wrap(True)
         elif pspec.name == 'icon':
             if self._icon != value:
diff --git a/src/sugar/graphics/toolbutton.py b/src/sugar/graphics/toolbutton.py
index bf392c8..715e7a9 100644
--- a/src/sugar/graphics/toolbutton.py
+++ b/src/sugar/graphics/toolbutton.py
@@ -65,6 +65,12 @@ class ToolButton(gtk.ToolButton):
             self.set_icon(icon_name)
 
         self.connect('clicked', self.__button_clicked_cb)
+        self.get_child().connect('can-activate-accel',
+                                 self.__button_can_activate_accel_cb)
+
+    def __button_can_activate_accel_cb(self, button, signal_id):
+        # Accept activation via accelerators regardless of this widget's state
+        return True
 
     def set_tooltip(self, tooltip):
         """ Set a simple palette with just a single label.
--
cgit v0.9.1