diff options
| -rwxr-xr-x | browser/browser.py | 8 | ||||
| -rwxr-xr-x | chat/chat.py | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/browser/browser.py b/browser/browser.py index 91386f2..64343db 100755 --- a/browser/browser.py +++ b/browser/browser.py @@ -11,9 +11,13 @@ import gtk import geckoembed import sys -import activity -from sugar_globals import * +try: + import activity + from sugar_globals import * +except ImportError: + from sugar import activity + from sugar.sugar_globals import * class AddressToolbar(gtk.Toolbar): def __init__(self): 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): |