Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
index 97629ed..5188ed6 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
@@ -15,6 +15,7 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
 
     internal const string SERVICE_WELCOME_MESSAGE =
         _("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
+    internal const string SERVICE_DISCLAIMER = "<b>This product uses the Flickr API but is not endorsed or certified by SmugMug, Inc.</b>";
 
     internal class AuthenticationRequestTransaction : Publishing.RESTSupport.OAuth1.Transaction {
         public AuthenticationRequestTransaction(Publishing.RESTSupport.OAuth1.Session session) {
@@ -55,7 +56,8 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
         public override void on_page_load() {
             var uri = new Soup.URI(get_view().get_uri());
             if (uri.scheme == "shotwell-auth" && this.auth_code == null) {
-                this.error();
+                var form_data = Soup.Form.decode (uri.query);
+                this.auth_code = form_data.lookup("oauth_verifier");
             }
 
             if (this.auth_code != null) {
@@ -108,7 +110,7 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
             debug("ACTION: installing login welcome pane");
 
             host.set_service_locked(false);
-            host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_welcome_pane_login_clicked);
+            host.install_welcome_pane("%s\n\n%s".printf(SERVICE_WELCOME_MESSAGE, SERVICE_DISCLAIMER), on_welcome_pane_login_clicked);
         }
 
         private void on_welcome_pane_login_clicked() {