summaryrefslogtreecommitdiff
path: root/plugins/common
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-08-15 09:42:50 +0200
committerJörg Frings-Fürst <debian@jff.email>2019-08-15 09:42:50 +0200
commitbf92a282ab553ace71530391de33bdbf676a66bd (patch)
tree9166cc293d60df92084ef07232d89db30818f87f /plugins/common
parent6ff104c4ac1f934296b996458b15bea29f062323 (diff)
parentb57c8088c3dad237b04bb792c6dade9c470ce9fd (diff)
Update upstream source from tag 'upstream/0.30.5'
Update to upstream version '0.30.5' with Debian dir 414e83264d008ad44f5b2ae7107ff5acc3b3ea86
Diffstat (limited to 'plugins/common')
-rw-r--r--plugins/common/WebAuthenticationPane.vala15
1 files changed, 15 insertions, 0 deletions
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: