GNOME.org
 

[shotwell/wip/phako/google-photos: 15/15] wip: Drop Picasaweb for good

commit f729bfdb03f2aeb5cd7fea187b4e2f4f9822aefc
Author: Jens Georg <mail jensge org>
Date:   Wed Jan 23 16:51:32 2019 +0100

    wip: Drop Picasaweb for good

 data/gsettings/org.yorba.shotwell.gschema.xml      |  39 +-
 data/org.gnome.Shotwell.appdata.xml.in             |   2 +-
 help/C/share-upload.page                           |   8 +-
 meson_options.txt                                  |   2 +-
 .../shotwell/ShotwellAuthenticatorFactory.vala     |   4 -
 .../shotwell-publishing/PhotosPublishingPane.vala  |   2 +-
 plugins/shotwell-publishing/PhotosUploader.vala    |   2 +-
 plugins/shotwell-publishing/PicasaPublishing.vala  | 772 ---------------------
 plugins/shotwell-publishing/meson.build            |   1 -
 .../org.gnome.Shotwell.Publishing.gresource.xml    |   2 -
 .../picasa_publishing_options_pane.ui              | 176 -----
 .../shotwell-publishing/shotwell-publishing.vala   |   8 +-
 src/plugins/StandardHostInterface.vala             |   3 -
 src/publishing/Publishing.vala                     |   1 -
 14 files changed, 12 insertions(+), 1010 deletions(-)
---
diff --git a/data/gsettings/org.yorba.shotwell.gschema.xml b/data/gsettings/org.yorba.shotwell.gschema.xml
index 2c0893e0..68593654 100644
--- a/data/gsettings/org.yorba.shotwell.gschema.xml
+++ b/data/gsettings/org.yorba.shotwell.gschema.xml
@@ -412,7 +412,6 @@
     <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
     <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
     <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
-    <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
     <child name="org-gnome-shotwell-publishing-google-photos" 
schema="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" />
     <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
 </schema>
@@ -487,43 +486,17 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/">
-    <key name="refresh-token" type="s">
-        <default>""</default>
-        <summary>refresh token</summary>
-        <description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged 
in user, if any.</description>
-    </key>
-
-    <key name="default-size" type="i">
-        <default>2</default>
-        <summary>default size</summary>
-        <description>A numeric code representing the default size for photos uploaded to Picasa Web 
Albums</description>
-    </key>
-
-    <key name="last-album" type="s">
-        <default>""</default>
-        <summary>last album</summary>
-        <description>The name of the last album the user published photos to, if any</description>
-    </key>
-
-    <key name="strip-metadata" type="b">
-        <default>false</default>
-        <summary>remove sensitive info from uploads</summary>
-        <description>Whether images being uploaded to Picasa should have their metadata removed 
first</description>
-    </key>
-</schema>
-
 <schema id="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" 
path="/org/yorba/shotwell/sharing/org-gnome-shotwell-publishing-google-photos/">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
-        <description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged 
in user, if any.</description>
+        <description>The OAuth token used to refresh the Google Photos session for the currently logged in 
user, if any.</description>
     </key>
 
     <key name="default-size" type="i">
         <default>2</default>
         <summary>default size</summary>
-        <description>A numeric code representing the default size for photos uploaded to Picasa Web 
Albums</description>
+        <description>A numeric code representing the default size for photos uploaded to Google Photos 
Albums</description>
     </key>
 
     <key name="last-album" type="s">
@@ -535,7 +508,7 @@
     <key name="strip-metadata" type="b">
         <default>false</default>
         <summary>remove sensitive info from uploads</summary>
-        <description>Whether images being uploaded to Picasa should have their metadata removed 
first</description>
+        <description>Whether images being uploaded to Google Photos should have their metadata removed 
first</description>
     </key>
 </schema>
 
@@ -748,12 +721,6 @@
         <description>True if the Flickr publishing plugin is enabled, false otherwise</description>
     </key>
 
-    <key name="publishing-picasa" type="b">
-        <default>true</default>
-        <summary>enable picasa publishing plugin</summary>
-        <description>True if the Picasa Web Albums publishing plugin is enabled, false 
otherwise</description>
-    </key>
-
     <key name="org-gnome-shotwell-publishing-google-photos" type="b">
         <default>true</default>
         <summary>enable Google Photos publishing plugin</summary>
diff --git a/data/org.gnome.Shotwell.appdata.xml.in b/data/org.gnome.Shotwell.appdata.xml.in
index dddbebbb..3586c1b4 100644
--- a/data/org.gnome.Shotwell.appdata.xml.in
+++ b/data/org.gnome.Shotwell.appdata.xml.in
@@ -17,7 +17,7 @@
     </p>
     <p>
       When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr,
-      Picasa (Google Plus), and more.
+      Google Photos, and more.
     </p>
     <p>
       Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.
diff --git a/help/C/share-upload.page b/help/C/share-upload.page
index 76740a5e..2cbcbd5b 100644
--- a/help/C/share-upload.page
+++ b/help/C/share-upload.page
@@ -4,7 +4,7 @@
 
     <info>
         <link type="guide" xref="index#share"/>
-        <desc>Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites.</desc>
+        <desc>Publish photos to Flickr, Google Photos, or other sites.</desc>
         
         <link type="next" xref="share-send" />
     </info>
@@ -17,7 +17,7 @@
     <list>
     <item><p><link href="https://facebook.com";>Facebook</link></p></item>
     <item><p><link href="https://flickr.com";>Flickr</link></p></item>
-    <item><p><link href="https://picasaweb.google.com";>Picasa Web Albums</link> and <link 
href="http://plus.google.com";>Google+</link></p></item>
+    <item><p><link href="https://photos.google.com";>Google Photos</link></p></item>
     <item><p><link href="https://youtube.com";>YouTube</link> (videos only)</p></item>
     <item><p><link href="https://tumblr.com";>Tumblr</link> (videos only)</p></item>
     <item><p>Any site running the <link href="http://piwigo.org";>Piwigo</link> photo gallery software 
(photos only)</p></item>
@@ -33,7 +33,5 @@
 </p>
     <note style="advanced"><p>You will be only able to publish images with at most the permission you 
granted to the Shotwell Facebook application</p></note>
     
-    <p>Similarly, publishing to Flickr requires you to log in and permit Shotwell Connect to access your 
account.</p>
-    
-    <p>If you have a Google account, but have not yet used Picasa Web Albums, you will need to log in to 
Picasa using a browser once before you can publish to this service.</p>
+    <p>Similarly, publishing to Flickr, YouTube or Google Photos requires you to log in and permit Shotwell 
Connect to access your account.</p>
 </page>
diff --git a/meson_options.txt b/meson_options.txt
index 30e3f3bf..3c81a5cd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
-option('publishers', type: 'string', value : 'flickr,picasa,piwigo,youtube,gallery3,tumblr', description: 
'The list of publishing plugins to build')
+option('publishers', type: 'string', value : 'flickr,googlephotos,piwigo,youtube,gallery3,tumblr', 
description: 'The list of publishing plugins to build')
 option('extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of 
extra publishing plugins')
 option('trace', type: 'string', value : '', description: 'Enable various trace  options (available: dtors, 
import, md5, metadata-writer, monitoring, pixbuf-cache, reflow, reflow-items)')
 option('measure', type: 'string', value : '', description : 'Enable various timing measurements(available : 
enhance, import, pipeline, view-filtering, thumbnail-cache)')
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala 
b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
index ee959e5b..36fb2902 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
@@ -14,7 +14,6 @@ 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");
@@ -29,9 +28,6 @@ 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":
diff --git a/plugins/shotwell-publishing/PhotosPublishingPane.vala 
b/plugins/shotwell-publishing/PhotosPublishingPane.vala
index af6e5a4f..c2de19e5 100644
--- a/plugins/shotwell-publishing/PhotosPublishingPane.vala
+++ b/plugins/shotwell-publishing/PhotosPublishingPane.vala
@@ -115,7 +115,7 @@ internal class PublishingOptionsPane : Gtk.Box, Spit.Publishing.DialogPane {
 
     private void on_publish_clicked() {
         // size_combo won't have been set to anything useful if this is the first time we've
-        // published to Picasa, and/or we've only published video before, so it may be negative,
+        // published to Google Photos, and/or we've only published video before, so it may be negative,
         // indicating nothing was selected. Clamp it to a valid value...
         int size_combo_last_active = (size_combo.get_active() >= 0) ? size_combo.get_active() : 0;
 
diff --git a/plugins/shotwell-publishing/PhotosUploader.vala b/plugins/shotwell-publishing/PhotosUploader.vala
index c6af0057..dbcfa96d 100644
--- a/plugins/shotwell-publishing/PhotosUploader.vala
+++ b/plugins/shotwell-publishing/PhotosUploader.vala
@@ -24,7 +24,7 @@ internal class UploadTransaction :
         try {
             mapped_file = new MappedFile(publishable.get_serialized_file().get_path(), false);
         } catch (FileError e) {
-            string msg = "Picasa: couldn't read data from %s: %s".printf(
+            string msg = "Google Photos: couldn't read data from %s: %s".printf(
                 publishable.get_serialized_file().get_path(), e.message);
             warning("%s", msg);
             
diff --git a/plugins/shotwell-publishing/meson.build b/plugins/shotwell-publishing/meson.build
index fd27a99e..eeac1773 100644
--- a/plugins/shotwell-publishing/meson.build
+++ b/plugins/shotwell-publishing/meson.build
@@ -1,7 +1,6 @@
 shotwell_publishing_sources = [
     'shotwell-publishing.vala',
     'FacebookPublishing.vala',
-    'PicasaPublishing.vala',
     'FlickrPublishing.vala',
     'TumblrPublishing.vala',
     'YouTubePublishing.vala',
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml 
b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index 2d6f2e18..af9ebf0b 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -3,14 +3,12 @@
   <gresource prefix="/org/gnome/Shotwell/Publishing">
       <file>facebook.png</file>
       <file>flickr.png</file>
-      <file>picasa.png</file>
       <file>piwigo.png</file>
       <file>youtube.png</file>
       <file>tumblr.png</file>
       <file>google-photos.svg</file>
       <file>facebook_publishing_options_pane.ui</file>
       <file>flickr_publishing_options_pane.ui</file>
-      <file>picasa_publishing_options_pane.ui</file>
       <file>google_photos_publishing_options_pane.ui</file>
       <file>piwigo_authentication_pane.ui</file>
       <file>piwigo_publishing_options_pane.ui</file>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala 
b/plugins/shotwell-publishing/shotwell-publishing.vala
index 000e7013..52c82ec1 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,11 +28,7 @@ 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);
         }
diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala
index 857c8ff7..d0f3ed4e 100644
--- a/src/plugins/StandardHostInterface.vala
+++ b/src/plugins/StandardHostInterface.vala
@@ -26,9 +26,6 @@ public class StandardHostInterface : Object, Spit.HostInterface {
             case "org.yorba.shotwell.publishing.facebook":
                 return "facebook";
             
-            case "org.yorba.shotwell.publishing.picasa":
-                return "picasa";
-            
             case "org.yorba.shotwell.publishing.flickr":
                 return "flickr";
                 
diff --git a/src/publishing/Publishing.vala b/src/publishing/Publishing.vala
index ad21f35e..455013c2 100644
--- a/src/publishing/Publishing.vala
+++ b/src/publishing/Publishing.vala
@@ -9,7 +9,6 @@ namespace Publishing {
 public void init() throws Error {
     string[] core_ids = new string[0];
     core_ids += "org.yorba.shotwell.publishing.facebook";
-    core_ids += "org.yorba.shotwell.publishing.picasa";
     core_ids += "org.yorba.shotwell.publishing.flickr";
     core_ids += "org.yorba.shotwell.publishing.youtube";
     core_ids += "org.yorba.shotwell.publishing.gnome-photos";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]