Work with both installed sugar and devel sources

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):

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):