diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-11-14 18:41:46 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-11-14 18:41:46 (GMT) |
| commit | b11f876c57c936d5eb350b63126c001b43f0a36c (patch) | |
| tree | 1eda79bfdc0db4bae09f2ca5d680f63f617f5ee4 | |
| parent | ce9db8eeb1309594ddd8aa7b7e8e4f9bec3de07a (diff) | |
| parent | 3160cb0779d30f807535f70e2dc915b1149f0e86 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | downloadmanager.py | 4 | ||||
| -rwxr-xr-x | webactivity.py | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,7 @@ -* use the window's fullscreen method to get to fullscreen mode, +* #4889: use the window's fullscreen method to get to fullscreen mode, this does not mess up the state the window manager has (erikos) +* #4870: Add onStatusChange method to Download. (tomeu) +* #4904: Save downloads to the instance dir, not tmp. (tomeu) 72 diff --git a/downloadmanager.py b/downloadmanager.py index 5e36280..063e66e 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -124,6 +124,10 @@ class Download: return NS_OK + def onStatusChange(self, web_progress, request, status, message): + logging.info('Download.onStatusChange(%r, %r, %r, %r)' % \ + (web_progress, request, status, message)) + def onStateChange(self, web_progress, request, state_flags, status): if state_flags == interfaces.nsIWebProgressListener.STATE_START: self._create_journal_object() diff --git a/webactivity.py b/webactivity.py index 39f82d3..123e28d 100755 --- a/webactivity.py +++ b/webactivity.py @@ -71,7 +71,7 @@ class WebActivity(activity.Activity): self._browser = Browser() - temp_path = os.path.join(self.get_activity_root(), 'tmp') + temp_path = os.path.join(self.get_activity_root(), 'instance') downloadmanager.init(self._browser, self, temp_path) sessionhistory.init(self._browser) progresslistener.init(self._browser) |