From b57c8088c3dad237b04bb792c6dade9c470ce9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 15 Aug 2019 09:42:33 +0200 Subject: New upstream version 0.30.5 --- plugins/common/WebAuthenticationPane.vala | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'plugins/common/WebAuthenticationPane.vala') diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala index c537748..1704780 100644 --- a/plugins/common/WebAuthenticationPane.vala +++ b/plugins/common/WebAuthenticationPane.vala @@ -12,6 +12,7 @@ namespace Shotwell.Plugins.Common { } public string login_uri { owned get; construct; } + public Error load_error { get; private set; default = null; } private WebKit.WebView webview; @@ -22,6 +23,7 @@ namespace Shotwell.Plugins.Common { 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); this.webview.context_menu.connect ( () => { return false; }); } @@ -29,11 +31,24 @@ namespace Shotwell.Plugins.Common { protected void set_cursor (Gdk.CursorType type) { var window = webview.get_window (); + if (window == null) + return; + var display = window.get_display (); + if (display == null) + return; + var cursor = new Gdk.Cursor.for_display (display, type); window.set_cursor (cursor); } + private bool on_page_load_failed (WebKit.LoadEvent load_event, string uri, Error error) { + critical ("Failed to load uri %s: %s", uri, error.message); + this.load_error = error; + + return false; + } + private void on_page_load_changed (WebKit.LoadEvent load_event) { switch (load_event) { case WebKit.LoadEvent.STARTED: -- cgit v1.2.3