From cdf7583d392c7a3b07607e914216df8b0435f62e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 12 Jun 2006 19:52:37 -0400 Subject: [PATCH] Adapt to the new api... get back the browser running --- sugar/browser/BrowserShell.py | 4 +--- 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 368d0f2b..a07d3c0b 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 fbbdaf6f..e90604ce 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