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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Dan Williams 2006-08-09 15:50:03 -04:00
commit c095192d08
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activities/browser/BrowserActivity.py
View File

@ -26,10 +26,12 @@ class BrowserActivity(Activity):
vbox.pack_start(self._notif_bar, False) vbox.pack_start(self._notif_bar, False)
self._notif_bar.connect('action', self.__notif_bar_action_cb) self._notif_bar.connect('action', self.__notif_bar_action_cb)
self.embed = geckoembed.Browser() self._embed = geckoembed.Browser()
self.embed.connect("title", self.__title_cb) self._embed.connect("title", self.__title_cb)
vbox.pack_start(self.embed) vbox.pack_start(self._embed)
self.embed.show() self._embed.show()
self._embed.load_address('http://www.google.com')
nav_toolbar = NavigationToolbar(self) nav_toolbar = NavigationToolbar(self)
vbox.pack_start(nav_toolbar, False) vbox.pack_start(nav_toolbar, False)
@ -70,9 +72,9 @@ class BrowserActivity(Activity):
self._go_to_shared_location() self._go_to_shared_location()
def _update_shared_location(self): def _update_shared_location(self):
address = self.embed.get_address() address = self._embed.get_address()
self._model.set_value('address', address) self._model.set_value('address', address)
title = self.embed.get_title() title = self._embed.get_title()
self._model.set_value('title', title) self._model.set_value('title', title)
def __notif_bar_action_cb(self, bar, action_id): def __notif_bar_action_cb(self, bar, action_id):
@ -83,11 +85,11 @@ class BrowserActivity(Activity):
def _go_to_shared_location(self): def _go_to_shared_location(self):
address = self._model.get_value("address") address = self._model.get_value("address")
self.embed.load_address(address) self._embed.load_address(address)
self._notif_bar.hide() self._notif_bar.hide()
def get_embed(self): def get_embed(self):
return self.embed return self._embed
def share(self): def share(self):
Activity.share(self) Activity.share(self)

1
shell/Session.py
View File

@ -15,7 +15,6 @@ class DbusProcess(Process):
def __init__(self): def __init__(self):
config = sugar.env.get_dbus_config() config = sugar.env.get_dbus_config()
cmd = "dbus-daemon --print-address --config-file %s" % config cmd = "dbus-daemon --print-address --config-file %s" % config
print cmd
Process.__init__(self, cmd) Process.__init__(self, cmd)
def get_name(self): def get_name(self):