Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/webactivity.py
diff options
context:
space:
mode:
authorRafael Ortiz <rafael@activitycentral.com>2011-05-23 19:42:45 (GMT)
committer Rafael Ortiz <rafael@activitycentral.com>2011-05-23 19:42:45 (GMT)
commitcc38d3bdc7f7f3ab4ed166166e0a8a71c2cbeaf0 (patch)
treef2afd90f1519c3720d653a81d6132c81bead2200 /webactivity.py
parent31b85d8286f830216d2c9ac0b88c049b0c3d8743 (diff)
Fix Stopping if downloads are in progress Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'webactivity.py')
-rw-r--r--webactivity.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/webactivity.py b/webactivity.py
index b444861..5f1ea5e 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -184,6 +184,7 @@ class WebActivity(activity.Activity):
_logger.debug('Starting the web activity')
+ self._force_close = False
self._tabbed_view = TabbedView()
_set_accept_languages()
@@ -601,7 +602,9 @@ class WebActivity(activity.Activity):
return buf
def can_close(self):
- if downloadmanager.can_quit():
+ if self._force_close:
+ return True
+ elif downloadmanager.can_quit():
return True
else:
alert = Alert()
@@ -616,6 +619,7 @@ class WebActivity(activity.Activity):
alert.connect('response', self.__inprogress_response_cb)
alert.show()
self.present()
+ return False
def __inprogress_response_cb(self, alert, response_id):
self.remove_alert(alert)
@@ -623,8 +627,9 @@ class WebActivity(activity.Activity):
logging.debug('Keep on')
elif response_id == gtk.RESPONSE_OK:
logging.debug('Stop downloads and quit')
+ self._force_close = True
downloadmanager.remove_all_downloads()
- self.close(force=True)
+ self.close()
def get_document_path(self, async_cb, async_err_cb):
browser = self._tabbed_view.props.current_browser