Merge branch 'feature/upstream' into develop

1 files changed, 2 insertions, 8 deletions

diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
index 02cffb2..b9f7280 100644
--- a/plugins/common/WebAuthenticationPane.vala
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -19,13 +19,8 @@ namespace Shotwell.Plugins.Common {
         private Gtk.Entry entry;
 
         public void clear() {
-            try {
-                debug("Clearing the data of WebKit...");
-                this.webview.get_website_data_manager().clear.begin(WebKit.WebsiteDataTypes.ALL, (GLib.TimeSpan)0);
-            } catch (Error e) {
-                // Do nothing
-                message("Failed to clear data: %s", e.message);
-            }
+            debug("Clearing the data of WebKit...");
+            this.webview.get_website_data_manager().clear.begin(WebKit.WebsiteDataTypes.ALL, (GLib.TimeSpan)0);
         }
 
         public override void constructed () {
@@ -44,7 +39,6 @@ namespace Shotwell.Plugins.Common {
             box.pack_start (entry, false, false, 6);
 
             this.webview = new WebKit.WebView ();
-            this.webview.get_settings ().enable_plugins = false;
 
             this.webview.load_changed.connect (this.on_page_load_changed);
             this.webview.load_failed.connect (this.on_page_load_failed);