Merge branch 'release/debian/0.30.7-1'debian/0.30.7-1

6 files changed, 14 insertions, 5 deletions

diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
index ea4d9ce..82448e2 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
@@ -51,6 +51,10 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
 
             var ctx = WebKit.WebContext.get_default();
             ctx.register_uri_scheme("shotwell-auth", this.on_shotwell_auth_request_cb);
+
+            var mgr = ctx.get_security_manager();
+            mgr.register_uri_scheme_as_secure("shotwell-auth");
+            mgr.register_uri_scheme_as_cors_enabled("shotwell-auth");
         }
 
         public override void on_page_load() {
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.vala b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
index 399b66f..39752ec 100644
--- a/plugins/authenticator/shotwell/OAuth1Authenticator.vala
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
@@ -12,7 +12,7 @@ namespace Publishing.Authenticator.Shotwell.OAuth1 {
         protected Publishing.RESTSupport.OAuth1.Session session;
         protected Spit.Publishing.PluginHost host;
 
-        public Authenticator(string api_key, string api_secret, Spit.Publishing.PluginHost host) {
+        protected Authenticator(string api_key, string api_secret, Spit.Publishing.PluginHost host) {
             base();
             this.host = host;
 
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;
 
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index c979b26..1633269 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1002,7 +1002,7 @@ internal class GraphSession {
         public weak GraphSession host_session;
         public int bytes_so_far;
         
-        public GraphMessageImpl(GraphSession host_session, Publishing.RESTSupport.HttpMethod method,
+        protected GraphMessageImpl(GraphSession host_session, Publishing.RESTSupport.HttpMethod method,
             string relative_uri, string access_token, Endpoint endpoint = Endpoint.DEFAULT) {
             this.method = method;
             this.access_token = access_token;
diff --git a/plugins/shotwell-transitions/shotwell-transitions.vala b/plugins/shotwell-transitions/shotwell-transitions.vala
index 7673414..1d2344f 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.vala
+++ b/plugins/shotwell-transitions/shotwell-transitions.vala
@@ -56,7 +56,7 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
 
     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
     
-    public ShotwellTransitionDescriptor(GLib.File resource_directory) {
+    protected ShotwellTransitionDescriptor(GLib.File resource_directory) {
         if (icon_pixbuf_set == null)
             icon_pixbuf_set =
                 Resources.load_from_resource(Resources.RESOURCE_PATH + "/" + ICON_FILENAME);