[epiphany/gnome-3-26] Do not auto-open adblock filters after download



commit 9d974514b16d1bc1317cb6b578e7763b39dc5a18
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Mar 25 16:26:06 2018 -0500

    Do not auto-open adblock filters after download
    
    Oooops!
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794646

 embed/ephy-download.c        |    4 ++++
 embed/ephy-download.h        |    3 ++-
 embed/ephy-filters-manager.c |    1 +
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 51eb5fe..a371670 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -449,6 +449,10 @@ ephy_download_do_download_action (EphyDownload          *download,
       LOG ("ephy_download_do_download_action: none");
       ret = TRUE;
       break;
+    case EPHY_DOWNLOAD_ACTION_DO_NOT_AUTO_OPEN:
+      LOG ("ephy_download_do_download_action: do_not_auto_open");
+      ret = TRUE;
+      break;
     default:
       g_assert_not_reached ();
   }
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index e71ff01..36fc14a 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -33,7 +33,8 @@ typedef enum
 {
   EPHY_DOWNLOAD_ACTION_NONE,
   EPHY_DOWNLOAD_ACTION_BROWSE_TO,
-  EPHY_DOWNLOAD_ACTION_OPEN
+  EPHY_DOWNLOAD_ACTION_OPEN,
+  EPHY_DOWNLOAD_ACTION_DO_NOT_AUTO_OPEN
 } EphyDownloadActionType;
 
 EphyDownload *ephy_download_new                   (WebKitDownload *download);
diff --git a/embed/ephy-filters-manager.c b/embed/ephy-filters-manager.c
index 20ca374..b895a88 100644
--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -148,6 +148,7 @@ start_retrieving_filter_file (EphyFiltersManager *manager,
   char *path;
 
   download = ephy_download_new_for_uri (filter_url);
+  ephy_download_set_action (download, EPHY_DOWNLOAD_ACTION_DO_NOT_AUTO_OPEN);
   path = g_file_get_uri (destination);
   ephy_download_set_destination_uri (download, path);
   g_free (path);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]