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 /browser | |
| parent | f56c3d45109c614ee481c95198a30439bbff552b (diff) | |
Work with both installed sugar and devel sources
Diffstat (limited to 'browser')
| -rwxr-xr-x | browser/browser.py | 8 |
1 files changed, 6 insertions, 2 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): |