Cancel PDF download when 'X' from TabLabel is clicked SL #4390

When the 'X' button is clicked from the TabLabel we emit 'tab-close'
signal and cancel the download on its callback if the tab closed is a
PDFTabPage.

Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
Acked-by: Manuel Quiñones <manuq@laptop.org>

Conflicts resolved: pdfviewer.py

2 files changed, 9 insertions, 2 deletions

diff --git a/browser.py b/browser.py
index 7419d2d..b786b6b 100644
--- a/browser.py
+++ b/browser.py
@@ -301,6 +301,11 @@ class TabbedView(BrowserNotebook):
             nth_page = self.get_nth_page(page_to_focus)
             nth_page.props.browser.grab_focus()
 
+        if isinstance(tab_page, PDFTabPage):
+            if tab_page.props.browser.props.load_status < \
+                    WebKit.LoadStatus.FINISHED:
+                tab_page.cancel_download()
+
         self.remove_page(self.page_num(tab_page))
         tab_page.destroy()
 
diff --git a/pdfviewer.py b/pdfviewer.py
index f1eb6a8..b98fab4 100644
--- a/pdfviewer.py
+++ b/pdfviewer.py
@@ -280,7 +280,7 @@ class DummyBrowser(GObject.GObject):
         return 0
 
     def stop_loading(self):
-        self._tab.cancel_download()
+        self._tab.close_tab()
 
     def reload(self):
         pass
@@ -408,9 +408,11 @@ class PDFTabPage(Gtk.HBox):
         logging.debug('Download error! code %s, detail %s: %s' % \
                           (err_code, err_detail, reason))
 
+    def close_tab(self, button=None):
+        self._browser.emit_close_tab()
+
     def cancel_download(self):
         self._download.cancel()
-        self._browser.emit_close_tab()
 
     def __journal_id_to_uri(self, journal_id):
         """Return an URI for a Journal object ID."""