Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rwxr-xr-xchat/chat.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/chat/chat.py b/chat/chat.py
index 590b65f..3db15ad 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -14,7 +14,12 @@ import os
import pwd
import socket
-import activity
+try:
+ import activity
+ from sugar_globals import *
+except ImportError:
+ from sugar import activity
+ from sugar.sugar_globals import *
import presence
import BuddyList
@@ -22,8 +27,6 @@ import network
import richtext
import xmlrpclib
-from sugar_globals import *
-
class Chat(activity.Activity):
def __init__(self, controller):