summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2014-09-02 21:23:04 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2014-09-03 12:17:29 +0200
commit0f370f93ecf34b4130079b0b4fe8853c82f8f0c3 (patch)
treeeab164fbd2591055859a70f046707bfa0f9355cb
parent4a9daa7faf47301915a60e2bef5da3d30a13827f (diff)
Fix URL used for flickr rest calls
https must be used, and the correct URL for uploads is up.flickr.com https://bugzilla.gnome.org/show_bug.cgi?id=735920 (cherry picked from commit 19c5f952e9e30790795f3548c125e53392e8bb14)
-rw-r--r--rest-extras/flickr-proxy-call.c4
-rw-r--r--rest-extras/flickr-proxy.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/rest-extras/flickr-proxy-call.c b/rest-extras/flickr-proxy-call.c
index d03f919..0c73f38 100644
--- a/rest-extras/flickr-proxy-call.c
+++ b/rest-extras/flickr-proxy-call.c
@@ -72,10 +72,10 @@ _prepare (RestProxyCall *call, GError **error)
if (GET_PRIVATE (call)->upload) {
- rest_proxy_bind (REST_PROXY(proxy), "upload");
+ rest_proxy_bind (REST_PROXY(proxy), "up", "upload");
rest_proxy_call_set_function (call, NULL);
} else {
- rest_proxy_bind (REST_PROXY(proxy), "rest");
+ rest_proxy_bind (REST_PROXY(proxy), "api", "rest");
rest_proxy_call_add_param (call, "method",
rest_proxy_call_get_function (call));
/* We need to reset the function because Flickr puts the function in the
diff --git a/rest-extras/flickr-proxy.c b/rest-extras/flickr-proxy.c
index 48f1c86..3342a4d 100644
--- a/rest-extras/flickr-proxy.c
+++ b/rest-extras/flickr-proxy.c
@@ -188,7 +188,7 @@ flickr_proxy_new_with_token (const char *api_key,
"api-key", api_key,
"shared-secret", shared_secret,
"token", token,
- "url-format", "http://api.flickr.com/services/%s/",
+ "url-format", "https://%s.flickr.com/services/%s/",
"binding-required", TRUE,
NULL);
}