diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-04-27 19:36:01 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-04-27 19:36:01 (GMT) |
| commit | 699bb17627ad4103e47731034db5e9d1854043ff (patch) | |
| tree | c3795ea8d7208dff80880e71284f6e70b54bbac6 /chat | |
| parent | f56c3d45109c614ee481c95198a30439bbff552b (diff) | |
Work with both installed sugar and devel sources
Diffstat (limited to 'chat')
| -rwxr-xr-x | chat/chat.py | 9 |
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): |