Merge branch 'feature/upstream' into develop

1 files changed, 3 insertions, 0 deletions

diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
index 17980e6..0d813ac 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
@@ -16,6 +16,7 @@ namespace Publishing.Authenticator {
             list.add("facebook");
             list.add("picasa");
             list.add("youtube");
+            list.add("tumblr");
 
             return list;
         }
@@ -32,6 +33,8 @@ namespace Publishing.Authenticator {
 
                 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:
                     return null;
             }