diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-24 13:46:10 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-24 13:46:10 (GMT) |
| commit | 745d11a79bd52c6dfe3173436e683689e8d0e5ef (patch) | |
| tree | 5782416d82bba2d6dd0d2816f21927f3c620e77a /activities | |
| parent | 06f815c713d498ca7e0e855b46b6a402a2197c28 (diff) | |
Fix opening links from gmail
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/web/webactivity.py | 7 | ||||
| -rw-r--r-- | activities/web/webbrowser.py | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/activities/web/webactivity.py b/activities/web/webactivity.py index 1329147..d96f412 100644 --- a/activities/web/webactivity.py +++ b/activities/web/webactivity.py @@ -33,7 +33,7 @@ from linkscontroller import LinksController _HOMEPAGE = 'http://www.google.com' class WebActivity(Activity): - def __init__(self): + def __init__(self, browser=None): Activity.__init__(self) logging.debug('Starting the web activity') @@ -42,7 +42,10 @@ class WebActivity(Activity): vbox = gtk.VBox() - self._browser = WebBrowser() + if browser: + self._browser = browser + else: + self._browser = WebBrowser() self._browser.connect('notify::title', self._title_changed_cb) self._links_model = LinksModel() diff --git a/activities/web/webbrowser.py b/activities/web/webbrowser.py index 247a120..771bbda 100644 --- a/activities/web/webbrowser.py +++ b/activities/web/webbrowser.py @@ -63,8 +63,12 @@ class _PopupCreator(gobject.GObject): logging.debug('Open a new activity for the popup') self._dialog.remove(self._embed) - activity = BrowserActivity(self._embed) - activity.set_type('com.redhat.Sugar.BrowserActivity') + # FIXME We need a better way to handle this. + # It seem like a pretty special case though, I doubt + # other activities will need something similar. + from web.webactivity import WebActivity + activity = WebActivity(self._embed) + activity.set_type('org.laptop.WebActivity') self._embed.disconnect(self._size_to_sid) self._embed.disconnect(self._vis_sid) |