Work with both installed sugar and devel sources

2006-04-27 15:36:01 -04:00
parent f56c3d4510
commit 699bb17627
2 changed files with 12 additions and 5 deletions
@@ -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):