diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-16 17:30:54 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-16 17:30:54 (GMT) |
| commit | 5446b2509f8c542925aa24b2d822e32b2a83e077 (patch) | |
| tree | 612284a73119a892c1e626da981f676f70ae959b | |
| parent | 4a564775bde0eb5d60d92e3343622e05464bade0 (diff) | |
| parent | 792481c66974838e663a9cf02cf04a34e4c7d17c (diff) | |
test merge
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | sugar/browser/BrowserActivity.py | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc @@ -1,6 +1,6 @@ Dependencies ============ - + xulrunner gecko-embed diff --git a/sugar/browser/BrowserActivity.py b/sugar/browser/BrowserActivity.py index f392c2d..e5e6ce7 100644 --- a/sugar/browser/BrowserActivity.py +++ b/sugar/browser/BrowserActivity.py @@ -9,8 +9,7 @@ from sugar.shell import activity from sugar.browser import NotificationBar from sugar.browser import NavigationToolbar from sugar.presence.PresenceService import PresenceService -import random - +from sugar.p2p.model.LocalModel import LocalModel _BROWSER_ACTIVITY_TYPE = "_web_olpc._udp" _SERVICE_URI_TAG = "URI" |