[shotwell] picasa: Skip default url from album list



commit e590ff354add6024dda62eab9c1aa9fe6cb4bca1
Author: Jens Georg <mail jensge org>
Date:   Mon Feb 27 20:29:06 2017 +0100

    picasa: Skip default url from album list
    
    Signed-off-by: Jens Georg <mail jensge org>

 plugins/shotwell-publishing/PicasaPublishing.vala  |    5 +++++
 plugins/shotwell-publishing/YouTubePublishing.vala |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala 
b/plugins/shotwell-publishing/PicasaPublishing.vala
index 8f8f647..d72ce6d 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -115,6 +115,11 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
                 }
             }
 
+            // If default album is present in the result list, just skip it because we added it on top anyway
+            if (url_val == DEFAULT_ALBUM_FEED_URL) {
+                continue;
+            }
+
             result += new Album(name_val, url_val);
         }
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala 
b/plugins/shotwell-publishing/YouTubePublishing.vala
index 62aef1b..87f1959 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -444,8 +444,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen
 
             // Yuck...
             var loop = new MainLoop(null, false);
-            this.splice_with_progress.begin(info, input_stream, upload_stream,
-                    (obj, res) => {
+            this.splice_with_progress.begin(info, input_stream, upload_stream, (obj, res) => {
                 try {
                     this.splice_with_progress.end(res);
                 } catch (Error error) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]