diff options
| author | Rafael Ortiz <rafael@activitycentral.com> | 2012-06-20 00:21:00 (GMT) |
|---|---|---|
| committer | Rafael Ortiz <rafael@activitycentral.com> | 2012-06-20 00:21:00 (GMT) |
| commit | 77b1ce3741635382c96afb152d874b8539f6079f (patch) | |
| tree | 212ed9b725c70c32c3690bc7d936d38e0133b80e | |
| parent | bfe14a3fe310a8e68f9da172021dc1977f1d29c9 (diff) | |
| parent | 12863e8ddb032bccee57a591bd2422f65ad63b1a (diff) | |
Merge branch 'gtk3' of git.sugarlabs.org:terminal/mainline into gtk3
| -rw-r--r-- | terminal.py | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/terminal.py b/terminal.py index 3a5bba5..9fb3b9a 100644 --- a/terminal.py +++ b/terminal.py @@ -118,7 +118,6 @@ class TerminalActivity(activity.Activity): self.set_toolbar_box(toolbar_box) toolbar_box.show() - self._update_accelerators(toolbar_box) self._notebook = BrowserNotebook() self._notebook.connect("tab-added", self.__open_tab_cb) @@ -130,28 +129,6 @@ class TerminalActivity(activity.Activity): self._create_tab(None) - def _update_accelerators(self, container): - for child in container.get_children(): - if isinstance(child, ToolButton): - if child.props.accelerator is not None: - # This code is copied from toolbutton.py - # to solve workaround bug described in OLPC #10930 - accel_group = self.get_data('sugar-accel-group') - keyval, mask = Gtk.accelerator_parse( - child.props.accelerator) - # the accelerator needs to be set at the child, - # so the Gtk.AccelLabel - # in the palette can pick it up. - child.get_child().add_accelerator('clicked', accel_group, - keyval, mask, - Gtk.AccelFlags.LOCKED | Gtk.AccelFlags.VISIBLE) - - if isinstance(child, ToolbarButton): - if child.get_page() is not None: - self._update_accelerators(child.get_page()) - if hasattr(child, 'get_children'): - self._update_accelerators(child) - def _create_edit_toolbar(self): edit_toolbar = EditToolbar() edit_toolbar.undo.props.visible = False @@ -469,8 +446,7 @@ class TerminalActivity(activity.Activity): def write_file(self, file_path): return - -# FIXME Bellow lines are commented in order to have journal access but we are not still saving a +# FIXME Bellow lines are commented in order to have journal access but we are n # file this is an upstream bug with Vte.Terminal.get_text, SL#3655 # # if not self.metadata['mime_type']: |