diff options
Diffstat (limited to 'plugins/common')
| -rw-r--r-- | plugins/common/RESTSupport.vala | 4 | ||||
| -rw-r--r-- | plugins/common/WebAuthenticationPane.vala | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala index 5cd3768..0d0a3fb 100644 --- a/plugins/common/RESTSupport.vala +++ b/plugins/common/RESTSupport.vala @@ -31,7 +31,7 @@ public abstract class Session { public signal void authenticated(); public signal void authentication_failed(Spit.Publishing.PublishingError err); - public Session(string? endpoint_url = null) { + protected Session(string? endpoint_url = null) { this.endpoint_url = endpoint_url; soup_session = new Soup.Session (); this.soup_session.ssl_use_system_ca_file = true; @@ -685,7 +685,7 @@ public abstract class BatchUploader { public signal void upload_complete(int num_photos_published); public signal void upload_error(Spit.Publishing.PublishingError err); - public BatchUploader(Session session, Spit.Publishing.Publishable[] publishables) { + protected BatchUploader(Session session, Spit.Publishing.Publishable[] publishables) { this.publishables = publishables; this.session = session; } diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala index 1704780..43afe65 100644 --- a/plugins/common/WebAuthenticationPane.vala +++ b/plugins/common/WebAuthenticationPane.vala @@ -43,6 +43,11 @@ namespace Shotwell.Plugins.Common { } private bool on_page_load_failed (WebKit.LoadEvent load_event, string uri, Error error) { + // OAuth call-back scheme. Produces a load error because it is not HTTP(S) + // Do not set the load_error, but continue the error handling + if (uri.has_prefix ("shotwell-auth://")) + return false; + critical ("Failed to load uri %s: %s", uri, error.message); this.load_error = error; |