diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-07-22 12:45:01 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-07-22 12:45:01 (GMT) |
commit | a912f82e928b56e7321949836ec5393ab4e0765d (patch) | |
tree | 24a4d947ffbfbf88df232c5380c39436a1ddd0f3 | |
parent | 6c580f9e36d6cceed948aec7d684a90b62ff2c93 (diff) | |
parent | 176c1fc419f92bd6b157b518b5489a0a0a396dbc (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r-- | src/view/clipboardmenu.py | 6 | ||||
-rw-r--r-- | src/view/home/HomeBox.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/view/clipboardmenu.py b/src/view/clipboardmenu.py index 649bcc1..3ffe111 100644 --- a/src/view/clipboardmenu.py +++ b/src/view/clipboardmenu.py @@ -206,7 +206,11 @@ class ClipboardMenu(Palette): else: file_path = self._write_to_temp_file(data['DATA']) transfer_ownership = True - mime_type = mime.get_for_file(file_path) + sniffed_mime_type = mime.get_for_file(file_path) + if sniffed_mime_type == 'application/octet-stream': + mime_type = format + else: + mime_type = sniffed_mime_type jobject = datastore.create() jobject.metadata['title'] = _('Clipboard object: %s.') % obj['NAME'] diff --git a/src/view/home/HomeBox.py b/src/view/home/HomeBox.py index 95a64da..d079145 100644 --- a/src/view/home/HomeBox.py +++ b/src/view/home/HomeBox.py @@ -213,7 +213,7 @@ class HomeToolbar(gtk.Toolbar): self._list_button = RadioToolButton(named_icon='view-list') self._list_button.props.group = favorites_button self._list_button.props.tooltip = _('List view') - self._list_button.props.accelerator = _('<Ctrl>L') + self._list_button.props.accelerator = _('<Ctrl>2') self._list_button.connect('toggled', self.__view_button_toggled_cb, _LIST_VIEW) self.insert(self._list_button, -1) @@ -271,7 +271,7 @@ class FavoritesButton(RadioToolButton): RadioToolButton.__init__(self) self.props.tooltip = _('Favorites view') - self.props.accelerator = _('<Ctrl>R') + self.props.accelerator = _('<Ctrl>1') self.props.group = None profile_layout_constant = profile.get_profile().favorites_layout |