Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-10-14 21:54:09 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-10-14 21:54:09 (GMT)
commitb1530cdd48023de9caf37786b9da3be842f0b84b (patch)
treeebdefb2e5ceea11d94ed2f4eccb6c1af829b3570
parent06b29d4399d5f40b218a625ab169746eaf17911a (diff)
Fix crash on startup
-rw-r--r--NEWS1
-rwxr-xr-xwebactivity.py7
2 files changed, 3 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index dc9e410..8c49963 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* Fix crash on startup. (marco)
* #3552: Cancel a donwload when the related journal entry is deleted. (tomeu)
62
diff --git a/webactivity.py b/webactivity.py
index 629f714..3064989 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -67,10 +67,7 @@ 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)
@@ -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()