Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 5 deletions

diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
index 0d813ac..36fb290 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
@@ -14,9 +14,9 @@ namespace Publishing.Authenticator {
             var list = new Gee.ArrayList<string>();
             list.add("flickr");
             list.add("facebook");
-            list.add("picasa");
             list.add("youtube");
             list.add("tumblr");
+            list.add("google-photos");
 
             return list;
         }
@@ -28,14 +28,13 @@ namespace Publishing.Authenticator {
                     return new Shotwell.Flickr.Flickr(host);
                 case "facebook":
                     return new Shotwell.Facebook.Facebook(host);
-                case "picasa":
-                    return new Shotwell.Google.Google("https://picasaweb.google.com/data/", _("You are not currently logged into Picasa Web Albums.\n\nClick Log in to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account."), host);
-
                 case "youtube":
                     return new Shotwell.Google.Google("https://gdata.youtube.com/", _("You are not currently logged into YouTube.\n\nYou must have already signed up for a Google account and set it up for use with YouTube to continue. You can set up most accounts by using your browser to log into the YouTube site at least once."), host);
                 case "tumblr":
                     return new Shotwell.Tumblr.Tumblr(host);
-                default:
+                case "google-photos":
+                    return new Shotwell.Google.Google("https://www.googleapis.com/auth/photoslibrary", _("You are not currently logged into Google Photos.\n\nYou must have already signed up for a Google account and set it up for use with Google Photos.\n\nYou will have to authorize Shotwell to link to your Google Photos account."), host);
+               default:
                     return null;
             }
         }