Merge tag 'upstream/0.25.4'

Upstream version 0.25.4

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index 29249a3..a10e9a6 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -422,7 +422,7 @@ GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
 static void tumblr_service_finalize (GObject* obj);
 #define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr"
-#define PUBLISHING_TUMBLR_ENDPOINT_URL "http://www.tumblr.com/"
+#define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
 #define PUBLISHING_TUMBLR_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k"
 #define PUBLISHING_TUMBLR_API_SECRET "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi"
 #define PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
@@ -5594,7 +5594,7 @@ PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumbl
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "http://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
 #line 5583 "TumblrPublishing.c"
@@ -5791,7 +5791,7 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = blog_url;
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup_printf ("http://api.tumblr.com/v2/blog/%s/post", _tmp2_);
+	_tmp3_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", _tmp2_);
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = _tmp3_;
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index 183bc31..12b4ade 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -59,7 +59,7 @@ public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {
 namespace Publishing.Tumblr {
 
 internal const string SERVICE_NAME = "Tumblr";
-internal const string ENDPOINT_URL = "http://www.tumblr.com/";
+internal const string ENDPOINT_URL = "https://www.tumblr.com/";
 internal const string API_KEY = "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k";
 internal const string API_SECRET = "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi";
 internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
@@ -865,7 +865,7 @@ internal class AccessTokenFetchTransaction : Transaction {
 
 internal class UserInfoFetchTransaction : Transaction {
     public UserInfoFetchTransaction(Session session) {
-        base.with_uri(session, "http://api.tumblr.com/v2/user/info",
+        base.with_uri(session, "https://api.tumblr.com/v2/user/info",
             Publishing.RESTSupport.HttpMethod.POST);
     }
 }
@@ -896,7 +896,7 @@ internal class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
 
     public UploadTransaction(Session session,Spit.Publishing.Publishable publishable, string blog_url)  {
 		debug("Init upload transaction");
-        base.with_endpoint_url(session, publishable,"http://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
+        base.with_endpoint_url(session, publishable,"https://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
         this.session = session;
 
     }
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 8e71f94..78c863a 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -542,7 +542,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).website_name = _tmp6_;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp7_ = g_strdup ("http://fotki.yandex.ru/");
+	_tmp7_ = g_strdup ("https://fotki.yandex.ru/");
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4556,7 +4556,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->session;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "http://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	_tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "https://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	t = _tmp3_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4692,7 +4692,7 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = g_strdup_printf ("http://oauth.yandex.ru/authorize?client_id=%s&response_type=token", PUBLISHING_YANDEX_client_id);
+	_tmp1_ = g_strdup_printf ("https://oauth.yandex.ru/authorize?client_id=%s&response_type=token", PUBLISHING_YANDEX_client_id);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = _tmp1_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 0bf929e..04b28d2 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -23,7 +23,7 @@ public class YandexService : Object, Spit.Pluggable, Spit.Publishing.Service {
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = _("Visit the Yandex.Fotki web site");
-        info.website_url = "http://fotki.yandex.ru/";
+        info.website_url = "https://fotki.yandex.ru/";
         info.is_license_wordwrapped = false;
         info.license = Resources.LICENSE;
     }
@@ -571,7 +571,7 @@ public class YandexPublisher : Spit.Publishing.Publisher, GLib.Object {
     public void fetch_account_information(string auth_token) {
         session.set_auth_token(auth_token);
 
-        Transaction t = new Transaction.with_url(session, "http://api-fotki.yandex.ru/api/me/");
+        Transaction t = new Transaction.with_url(session, "https://api-fotki.yandex.ru/api/me/");
         t.completed.connect(fetch_account_complete);
         t.network_error.connect(fetch_account_error);
 
@@ -598,7 +598,7 @@ public class YandexPublisher : Spit.Publishing.Publisher, GLib.Object {
     private void start_web_auth() {
         host.set_service_locked(false);
 
-        web_auth_pane = new WebAuthPane(("http://oauth.yandex.ru/authorize?client_id=%s&response_type=token").printf(client_id));
+        web_auth_pane = new WebAuthPane(("https://oauth.yandex.ru/authorize?client_id=%s&response_type=token").printf(client_id));
         web_auth_pane.login_succeeded.connect(web_auth_login_succeeded);
         web_auth_pane.login_failed.connect(web_auth_login_failed);