diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-05 04:30:44 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-05 04:30:44 (GMT) |
commit | 411aa366d1acc92822c64feb4ab80cc53df44faa (patch) | |
tree | 21f37095199a567947e1d407828974422227da54 | |
parent | 1a4042947069aac2c5ddd37c85abb7b42b522f0c (diff) | |
parent | 9b85e6c0894e41038d762e7b599e2fee319ec999 (diff) |
Merge branch 'master' of git.sugarlabs.org:write/mainline
-rw-r--r-- | activity/activity.info | 2 | ||||
-rw-r--r-- | speech.py | 2 | ||||
-rw-r--r-- | speech_gst.py | 2 | ||||
-rw-r--r-- | speechtoolbar.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/activity/activity.info b/activity/activity.info index 8b2221f..3e0fb7e 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,7 +3,7 @@ name = Write bundle_id = org.laptop.AbiWordActivity exec = sugar-activity AbiWordActivity.AbiWordActivity icon = activity-write -activity_version = 78 +activity_version = 79 show_launcher = 1 mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text license = GPLv2+ @@ -17,7 +17,7 @@ import logging -_logger = logging.getLogger('read-etexts-activity') +_logger = logging.getLogger('write-activity') supported = True diff --git a/speech_gst.py b/speech_gst.py index b827ad9..64d4ee3 100644 --- a/speech_gst.py +++ b/speech_gst.py @@ -19,7 +19,7 @@ import logging import speech -_logger = logging.getLogger('read-etexts-activity') +_logger = logging.getLogger('write-activity') def get_all_voices(): diff --git a/speechtoolbar.py b/speechtoolbar.py index ca6eae5..6d4d56d 100644 --- a/speechtoolbar.py +++ b/speechtoolbar.py @@ -73,7 +73,7 @@ class SpeechToolbar(gtk.Toolbar): combotool = ToolComboBox(self.voice_combo) self.insert(combotool, -1) combotool.show() - speech.reset_buttons_cb = self.reset_buttons_cb + speech.reset_cb = self.reset_buttons_cb speech.end_text_cb = self.reset_buttons_cb def compare_voices(self, a, b): @@ -170,7 +170,7 @@ class SpeechToolbar(gtk.Toolbar): # play selected text, if not, play all abi = self._activity.abiword_canvas selection = abi.get_selection('text/plain') - if selection[1] == 0: + if selection[0] is None or selection[1] == 0: # nothing selected abi.select_all() text = abi.get_selection('text/plain')[0] |