On 7/31/06, Marco Pesenti Gritti <[EMAIL PROTECTED]> wrote:
[...]
> Done except for the relicensing. Galeon and epiphany heritage are
> making that a bit more involved.
Thanks! For dealing with the relicensing pain too...
> The OLPC's browser app will need fixing (geckoembed.Embed to
> geckoembed.Browser).
Patch attached.
For those who didn't follow the thread: you will need this patch to
run the browser activity in a HEAD build.
Best,
Rob
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py
index e9e0671..dcf00b6 100644
--- a/activities/browser/BrowserActivity.py
+++ b/activities/browser/BrowserActivity.py
@@ -42,12 +42,12 @@ class BrowserActivity(Activity):
vbox.pack_start(self._notif_bar, False)
self._notif_bar.connect('action', self.__notif_bar_action_cb)
- self.embed = geckoembed.Embed()
- self.embed.connect("title", self.__title_cb)
- vbox.pack_start(self.embed)
+ self.browser = geckoembed.Browser()
+ self.browser.connect("title", self.__title_cb)
+ vbox.pack_start(self.browser)
- self.embed.show()
- self.embed.load_address(self.uri)
+ self.browser.show()
+ self.browser.load_address(self.uri)
nav_toolbar = NavigationToolbar(self)
vbox.pack_start(nav_toolbar, False)
@@ -81,9 +81,9 @@ class BrowserActivity(Activity):
self._model.add_listener(self.__shared_location_changed_cb)
def _update_shared_location(self):
- address = self.embed.get_address()
+ address = self.browser.get_address()
self._model.set_value('address', address)
- title = self.embed.get_title()
+ title = self.browser.get_title()
self._model.set_value('title', title)
def __notif_bar_action_cb(self, bar, action_id):
@@ -91,7 +91,7 @@ class BrowserActivity(Activity):
self._update_shared_location()
elif action_id == 'goto_shared_location':
address = self._model.get_value("address")
- self.embed.load_address(address)
+ self.browser.load_address(address)
self._notif_bar.hide()
def set_mode(self, mode):
@@ -102,12 +102,12 @@ class BrowserActivity(Activity):
self._notif_bar.set_icon('stock_shared-by-me')
self._notif_bar.show()
- def get_embed(self):
- return self.embed
+ def get_browser(self):
+ return self.browser
def publish(self):
- escaped_title = xml.sax.saxutils.escape(self.embed.get_title())
- escaped_url = xml.sax.saxutils.escape(self.embed.get_address())
+ escaped_title = xml.sax.saxutils.escape(self.browser.get_title())
+ escaped_url = xml.sax.saxutils.escape(self.browser.get_address())
# Publish ourselves on the network
properties = {_SERVICE_URI_TAG: escaped_url, _SERVICE_TITLE_TAG: escaped_title}
@@ -121,8 +121,8 @@ class BrowserActivity(Activity):
self.set_mode(BrowserActivity.LEADING)
- def __title_cb(self, embed):
- self.set_title(embed.get_title())
+ def __title_cb(self, browser):
+ self.set_title(browser.get_title())
def __shared_location_changed_cb(self, model, key):
self.set_has_changes(True)
diff --git a/activities/browser/NavigationToolbar.py b/activities/browser/NavigationToolbar.py
index c8bc276..20c0826 100644
--- a/activities/browser/NavigationToolbar.py
+++ b/activities/browser/NavigationToolbar.py
@@ -8,7 +8,7 @@ class NavigationToolbar(gtk.Toolbar):
def __init__(self, browser):
gtk.Toolbar.__init__(self)
self._browser = browser
- self._embed = self._browser.get_embed()
+ self._embed = self._browser.get_browser()
self.set_style(gtk.TOOLBAR_BOTH_HORIZ)
_______________________________________________
Sugar mailing list
[email protected]
http://mailman.laptop.org/mailman/listinfo/sugar
