diff options
author | Antoine van Gelder <antoine@g7.org.za> | 2007-10-30 20:45:00 (GMT) |
---|---|---|
committer | Antoine van Gelder <antoine@g7.org.za> | 2007-10-30 20:45:00 (GMT) |
commit | f67a1150e9f23c8b23e83b10cc97b2a43d59215f (patch) | |
tree | 5243c8ba6ccce317cef66498699544973794286d /pages/joke.py | |
parent | 9212845e255add6026000bddbe659f192e596687 (diff) |
* Feature: If no sound set, play default sound: laugh_attack.au
* Fixed: Activity icon now adopts users color scheme
* Fixed: Temp directory now rooted off activity.get_activity_root()
* Fixed: Moved locale/ dir back to po/
* Fixed: Temp filenames now created using more secure tempfile.mkstemp()
* i18n: Changed pot files to utf-8
Diffstat (limited to 'pages/joke.py')
-rw-r--r-- | pages/joke.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pages/joke.py b/pages/joke.py index 43d0764..ee92fb8 100644 --- a/pages/joke.py +++ b/pages/joke.py @@ -19,6 +19,7 @@ import gtk import hippo import pango from gettext import gettext as _ +import logging from globals import Globals from gui.page import Page @@ -134,11 +135,14 @@ class Joke(Page): def __do_clicked_answer(self, button, jokebook, joke_id): # play a sound if the jokebook has one + player = AudioPlayer() if jokebook.sound_blob != None: - player = AudioPlayer() player.raw = jokebook.sound_blob - player.play() - + else: # default laugh + logging.debug('Playing default sound: %s', Globals.laugh_uri) + player.uri = Globals.laugh_uri + player.play() + # show the answer self.joke_box.answer_box.set_visible(True) |