Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/brain.py
diff options
context:
space:
mode:
authorDaniel Francis <francis@sugarlabs.org>2012-07-01 17:01:31 (GMT)
committer Rafael Ortiz <rafael@activitycentral.com>2012-07-03 05:29:31 (GMT)
commit6b9ff449e17cc7ac7327138234a72b1066202c18 (patch)
treee7746f077b65a16c2af61eb42e129ccef3d63ed6 /brain.py
parent4e2df4e10931eac04393c3cc8abe99953b17dcc6 (diff)
Migrating from the early toolbarbox-toolkit modules to Sugar Toolkit
This little patch is the second step in the Gtk3 migration. Here I remove some few unnecesary files always when it was possible, and use Sugar Toolkit. The purpose is to prevent a headache at the time of porting to Gtk3 the activity, and of course remove some useless kilobytes and not having written the same code twice. I also modified the .gitignore file, I didn't type 'git add .gitignore' previous than my commit so I didn't expect it would appear in my patch, I think git has its own life :) , but anyway, is better having a correct .gitignore . Signed-off-by: Daniel Francis <francis@sugarlabs.org>
Diffstat (limited to 'brain.py')
-rw-r--r--brain.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/brain.py b/brain.py
index 8a7d5e7..d98578f 100644
--- a/brain.py
+++ b/brain.py
@@ -26,7 +26,7 @@ from gettext import gettext as _
import logging
logger = logging.getLogger('speak')
-from toolkit.combobox import ComboBox
+from combobox import ComboBox
import aiml
import voice
@@ -86,7 +86,7 @@ def load(activity, voice, sorry=None):
if voice == _kernel_voice:
return False
- old_cursor = activity.get_cursor()
+ old_cursor = activity._cursor
activity.set_cursor(gtk.gdk.WATCH)
def load_brain():