Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTam.py
diff options
context:
space:
mode:
authorJames <olpc@localhost.localdomain>2007-02-28 01:59:38 (GMT)
committer James <olpc@localhost.localdomain>2007-02-28 01:59:38 (GMT)
commitb2b3c26ff63f7231bfbe1bdfea14b84f5aa90b65 (patch)
treebf4c56296bd217f692a2e02380e3f7c1ee36cabe /TamTam.py
parentbc3a0e329ade384a30ada354d99c0a75cc20e2da (diff)
bug fixing
Diffstat (limited to 'TamTam.py')
-rwxr-xr-xTamTam.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/TamTam.py b/TamTam.py
index d75fc0d..d1caf32 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -12,10 +12,16 @@ from Edit.MainWindow import MainWindow
from Welcome import Welcome
from SynthLab.SynthLabWindow import SynthLabWindow
-try :
- from sugar.activity.Activity import Activity
-except ImportError:
- from FActivity import FakeActivity as Activity
+if __name__ != '__main__':
+ try:
+ from sugar.activity.Activity import Activity
+ print 'using sugar Activity'
+ except ImportError:
+ from FActivity import FakeActivity as Activity
+ print 'using fake activity'
+else:
+ from FActivity import FakeActivity as Activity
+ print 'using fake activity'
if not os.path.isdir(Config.PREF_DIR):
os.mkdir(Config.PREF_DIR)
@@ -86,6 +92,7 @@ class TamTam(Activity):
else:
self.add( self.modeList[ self.mode ] )
self.modeList[ self.mode ].onActivate(arg)
+ self.show()
def onFocusIn(self, event, data=None):
print 'DEBUG: TamTam::onFocusOut in TamTam.py'
@@ -135,7 +142,6 @@ class TamTam(Activity):
gtk.main_quit()
-
if __name__ == "__main__":
if len(sys.argv) > 1 :
mainwin = TamTam(None, sys.argv[1])