From 4346abe0f809bc3a03052a778e2f42a0e8f1e269 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <dirakx@gmail.com>
Date: Sun, 23 Jan 2011 23:20:06 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/speak/mainline

---
diff --git a/activity.py b/activity.py
index 3e32255..38cc4ae 100644
--- a/activity.py
+++ b/activity.py
@@ -409,6 +409,7 @@ class SpeakActivity(SharedActivity):
         try:
             self.voices.handler_block_by_func(self.__changed_voices_cb)
             self.voices.select(new_voice)
+            self.face.status.voice = new_voice
         finally:
             self.voices.handler_unblock_by_func(self.__changed_voices_cb)
 
@@ -473,13 +474,9 @@ class SpeakActivity(SharedActivity):
 
     def __changed_voices_cb(self, combo):
         voice = combo.props.value
-
+        self.face.set_voice(voice)
         if self._mode == MODE_BOT:
-            self.face.set_voice(voice)
             brain.load(self, voice)
-        else:
-            self.face.set_voice(voice)
-            self.face.say_notification(voice.friendlyname)
 
 
 # activate gtk threads when this module loads
--
cgit v0.9.1