Photos

Merge lp:~parnold-x/pantheon-photos/fix-1429519 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1429519
  2. Merge into trunk
Proposed by Djax
Status: Merged
Approved by: Cody Garver
Approved revision: 2748
Merged at revision: 2755
Proposed branch: lp:~parnold-x/pantheon-photos/fix-1429519
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 47 lines (+5/-5)
1 file modified
plugins/shotwell-publishing/FlickrPublishing.vala (+5/-5)
To merge this branch: bzr merge lp:~parnold-x/pantheon-photos/fix-1429519
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+252883@code.launchpad.net

Commit message

Use https instead of http for Flickr publishing (lp:1429519)

Description of the change

Fix Flickr publishing broken (HTTP 403 Forbidden) #1429519
Use https instead of http.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/shotwell-publishing/FlickrPublishing.vala'
2--- plugins/shotwell-publishing/FlickrPublishing.vala 2014-08-29 00:46:35 +0000
3+++ plugins/shotwell-publishing/FlickrPublishing.vala 2015-03-13 11:05:00 +0000
4@@ -61,7 +61,7 @@
5 _ ("You are not currently logged into Flickr.\n\nClick Login to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
6 internal const string RESTART_ERROR_MESSAGE =
7 _ ("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to Flickr, quit and restart Shotwell, then try publishing again.");
8-internal const string ENDPOINT_URL = "http://api.flickr.com/services/rest";
9+internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
10 internal const string API_KEY = "60dd96d4a2ad04888b09c9e18d82c26f";
11 internal const string API_SECRET = "d0960565e03547c1";
12 internal const int ORIGINAL_SIZE = -1;
13@@ -414,7 +414,7 @@
14 }
15
16 private void do_launch_system_browser (string token) {
17- string login_uri = "http://www.flickr.com/services/oauth/authorize?oauth_token=" + token +
18+ string login_uri = "https://www.flickr.com/services/oauth/authorize?oauth_token=" + token +
19 "&perms=write";
20
21 debug ("ACTION: launching system browser with uri = '%s'", login_uri);
22@@ -844,14 +844,14 @@
23
24 internal class AuthenticationRequestTransaction : Transaction {
25 public AuthenticationRequestTransaction (Session session) {
26- base.with_uri (session, "http://www.flickr.com/services/oauth/request_token",
27+ base.with_uri (session, "https://www.flickr.com/services/oauth/request_token",
28 Publishing.RESTSupport.HttpMethod.GET);
29 }
30 }
31
32 internal class AccessTokenFetchTransaction : Transaction {
33 public AccessTokenFetchTransaction (Session session, string user_verifier) {
34- base.with_uri (session, "http://www.flickr.com/services/oauth/access_token",
35+ base.with_uri (session, "https://www.flickr.com/services/oauth/access_token",
36 Publishing.RESTSupport.HttpMethod.GET);
37 add_argument ("oauth_verifier", user_verifier);
38 add_argument ("oauth_token", session.get_request_phase_token ());
39@@ -873,7 +873,7 @@
40
41 public UploadTransaction (Session session, PublishingParameters parameters,
42 Spit.Publishing.Publishable publishable) {
43- base.with_endpoint_url (session, publishable, "http://api.flickr.com/services/upload");
44+ base.with_endpoint_url (session, publishable, "https://api.flickr.com/services/upload");
45
46 this.parameters = parameters;
47 this.session = session;

Subscribers

People subscribed via source and target branches

to all changes: