Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index 3515f5f..52c82ec 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -6,7 +6,7 @@
 
 extern const string _VERSION;
 
-// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube
+// "core services" are: Flickr, Google Photos, Piwigo, Tumblr and YouTube
 private class ShotwellPublishingCoreServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
@@ -28,9 +28,9 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
         }
 #endif
 
-#if HAVE_PICASA
-        if (authenicators.contains("picasa")) {
-            pluggables += new PicasaService(resource_directory);
+#if HAVE_GOOGLEPHOTOS
+        if (authenicators.contains("google-photos")) {
+            pluggables += new Publishing.GooglePhotos.Service(resource_directory);
         }
 #endif