sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt to the new api... get back the browser running

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-06-12 19:52:37 -04:00
parent 37d6c00fc3
commit cdf7583d39
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sugar/browser/BrowserShell.py
View File

@ -4,7 +4,6 @@ import threading
import sugar.env import sugar.env
from sugar.p2p.Group import LocalGroup
from sugar.browser.WebActivity import WebActivity from sugar.browser.WebActivity import WebActivity
from sugar.browser.BrowserActivity import BrowserActivity from sugar.browser.BrowserActivity import BrowserActivity
@ -30,7 +29,6 @@ class BrowserShell(dbus.service.Object):
dbus.service.Object.__init__(self, bus_name, object_path) dbus.service.Object.__init__(self, bus_name, object_path)
self.__browsers = [] self.__browsers = []
self._group = LocalGroup()
def open_web_activity(self): def open_web_activity(self):
web_activity = WebActivity(self) web_activity = WebActivity(self)
@ -49,6 +47,6 @@ class BrowserShell(dbus.service.Object):
@dbus.service.method('com.redhat.Sugar.BrowserShell') @dbus.service.method('com.redhat.Sugar.BrowserShell')
def open_browser(self, uri): def open_browser(self, uri):
browser = BrowserActivity(self._group, uri) browser = BrowserActivity(None, uri)
self.__browsers.append(browser) self.__browsers.append(browser)
browser.connect_to_shell() browser.connect_to_shell()

7
sugar/chat/chat.py
View File

@ -13,10 +13,9 @@ pygtk.require('2.0')
import gtk, gobject, pango import gtk, gobject, pango
from sugar.shell import activity from sugar.shell import activity
from sugar.p2p.Group import Group from sugar.presence.Group import Group
from sugar.p2p import Buddy from sugar.presence import Buddy
from sugar.p2p.Group import LocalGroup from sugar.presence.Service import Service
from sugar.p2p.Service import Service
from sugar.p2p.Stream import Stream from sugar.p2p.Stream import Stream
from sugar.p2p import network from sugar.p2p import network
from sugar.session.LogWriter import LogWriter from sugar.session.LogWriter import LogWriter