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

Fix starting browser activity

Browse Source
This commit is contained in:
Dan Williams 2006-06-16 16:31:54 -04:00
parent 0363ed5457
commit e4a8518d02
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sugar/browser/BrowserShell.py
View File

@ -3,6 +3,7 @@ import geckoembed
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
import gtk import gtk
import gobject
import sugar.env import sugar.env
@ -29,11 +30,14 @@ class BrowserShell(dbus.service.Object):
links.append(link) links.append(link)
return links return links
def _start_browser_cb(self, browser):
browser.connect_to_shell()
@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(uri) browser = BrowserActivity(uri)
self.__browsers.append(browser) self.__browsers.append(browser)
browser.connect_to_shell() gobject.idle_add(self._start_browser_cb, browser)
@dbus.service.method('com.redhat.Sugar.BrowserShell') @dbus.service.method('com.redhat.Sugar.BrowserShell')
def open_browser_with_id(self, uri, activity_id): def open_browser_with_id(self, uri, activity_id):

4
sugar/shell/StartPage.py
View File

@ -65,9 +65,9 @@ class ActivitiesView(gtk.TreeView):
print 'Activated row %s %s' % (address, activity_id) print 'Activated row %s %s' % (address, activity_id)
if activity_id is None: if activity_id is None:
browser_shell.open_browser(address, ignore_reply=True) browser_shell.open_browser(address)
else: else:
browser_shell.open_browser_with_id(address, activity_id, ignore_reply=True) browser_shell.open_browser_with_id(address, activity_id)
class StartPage(gtk.HBox): class StartPage(gtk.HBox):
def __init__(self): def __init__(self):