diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-12 23:52:37 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-12 23:52:37 (GMT) |
| commit | cdf7583d392c7a3b07607e914216df8b0435f62e (patch) | |
| tree | fa995dd85b6bcb6add15a818f87fd61aa1e6ff47 /sugar | |
| parent | 37d6c00fc34cecadfdd428ed8cda27be33588b09 (diff) | |
Adapt to the new api... get back the browser running
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/browser/BrowserShell.py | 4 | ||||
| -rwxr-xr-x | sugar/chat/chat.py | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sugar/browser/BrowserShell.py b/sugar/browser/BrowserShell.py index 368d0f2..a07d3c0 100644 --- a/sugar/browser/BrowserShell.py +++ b/sugar/browser/BrowserShell.py @@ -4,7 +4,6 @@ import threading import sugar.env -from sugar.p2p.Group import LocalGroup from sugar.browser.WebActivity import WebActivity from sugar.browser.BrowserActivity import BrowserActivity @@ -30,7 +29,6 @@ class BrowserShell(dbus.service.Object): dbus.service.Object.__init__(self, bus_name, object_path) self.__browsers = [] - self._group = LocalGroup() def open_web_activity(self): web_activity = WebActivity(self) @@ -49,6 +47,6 @@ class BrowserShell(dbus.service.Object): @dbus.service.method('com.redhat.Sugar.BrowserShell') def open_browser(self, uri): - browser = BrowserActivity(self._group, uri) + browser = BrowserActivity(None, uri) self.__browsers.append(browser) browser.connect_to_shell() diff --git a/sugar/chat/chat.py b/sugar/chat/chat.py index fbbdaf6..e90604c 100755 --- a/sugar/chat/chat.py +++ b/sugar/chat/chat.py @@ -13,10 +13,9 @@ pygtk.require('2.0') import gtk, gobject, pango from sugar.shell import activity -from sugar.p2p.Group import Group -from sugar.p2p import Buddy -from sugar.p2p.Group import LocalGroup -from sugar.p2p.Service import Service +from sugar.presence.Group import Group +from sugar.presence import Buddy +from sugar.presence.Service import Service from sugar.p2p.Stream import Stream from sugar.p2p import network from sugar.session.LogWriter import LogWriter |