Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/webactivity.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-10-14 17:05:53 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-10-14 17:05:53 (GMT)
commit673ac88becbe9bc3845ce2d528c1e72d14584561 (patch)
tree03e3db1cb7727eb676716249bdce63756e54eaaa /webactivity.py
parent382066f4409e294679b0093e894155b02492491f (diff)
Removed the clipboard part from the download manager and added alerts
Diffstat (limited to 'webactivity.py')
-rwxr-xr-xwebactivity.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/webactivity.py b/webactivity.py
index 629f714..61b2d0e 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -67,13 +67,10 @@ class WebActivity(activity.Activity):
_logger.debug('Starting the web activity')
- if browser:
- self._browser = browser
- else:
- self._browser = Browser()
+ self._browser = Browser()
temp_path = os.path.join(self.get_activity_root(), 'tmp')
- downloadmanager.init(self._browser, temp_path)
+ downloadmanager.init(self._browser, self, temp_path)
sessionhistory.init(self._browser)
progresslistener.init(self._browser)
@@ -118,7 +115,7 @@ class WebActivity(activity.Activity):
if handle.uri:
self._browser.load_uri(handle.uri)
- elif not self._jobject.file_path and not browser:
+ elif not self._jobject.file_path:
# TODO: we need this hack until we extend the activity API for
# opening URIs and default docs.
self._load_homepage()