Merge lp:~timo-jyrinki/ubuntu/quantal/unity-scope-video-remote/ubuntu.0310_11 into lp:ubuntu/quantal/unity-scope-video-remote

Proposed by Timo Jyrinki on 2013-04-15
Status: Merged
Merge reported by: Timo Jyrinki
Merged at revision: not available
Proposed branch: lp:~timo-jyrinki/ubuntu/quantal/unity-scope-video-remote/ubuntu.0310_11
Merge into: lp:ubuntu/quantal/unity-scope-video-remote
Diff against target: 36 lines (+10/-1)
2 files modified
debian/changelog (+7/-0)
src/unity-scope-video-remote (+3/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/quantal/unity-scope-video-remote/ubuntu.0310_11
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2013-04-15
Ubuntu branches 2013-04-15 Pending
Review via email: mp+158866@code.launchpad.net

Commit Message

* Cherry-pick a fix from upstream:
    - Use https connection when talking to the server (LP: #1071079)

Description of the Change

  * Cherry-pick a fix from upstream:
    - Use https connection when talking to the server (LP: #1071079)

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks, I uploaded it as well, I can't mark the merge request as merged though, can you do that so it falls off the sponsoring queue?

review: Approve
Timo Jyrinki (timo-jyrinki) wrote :

thank you, done

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-17 15:01:22 +0000
3+++ debian/changelog 2013-04-15 08:56:29 +0000
4@@ -1,3 +1,10 @@
5+unity-scope-video-remote (0.3.10-0ubuntu1.1) UNRELEASED; urgency=low
6+
7+ * Cherry-pick a fix from upstream:
8+ - Use https connection when talking to the server (LP: #1071079)
9+
10+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 25 Feb 2013 14:08:59 +0200
11+
12 unity-scope-video-remote (0.3.10-0ubuntu1) quantal-proposed; urgency=low
13
14 * New upstream release.
15
16=== modified file 'src/unity-scope-video-remote'
17--- src/unity-scope-video-remote 2012-10-11 21:27:49 +0000
18+++ src/unity-scope-video-remote 2013-04-15 08:56:29 +0000
19@@ -56,7 +56,7 @@
20 CAT_INDEX_MORE = 2
21
22 BUS_NAME = "net.launchpad.scope.RemoteVideos"
23-SERVER = "http://videosearch.ubuntu.com/v0"
24+SERVER = "https://videosearch.ubuntu.com/v0"
25
26 REFRESH_INTERVAL = 3600 # fetch sources & recommendations once an hour
27 RETRY_INTERVAL = 60 # retry sources/recommendations after a minute
28@@ -90,6 +90,8 @@
29 self.scope.connect("generate-search-key", lambda scope, search: search.props.search_string.strip())
30 self.session = Soup.SessionAsync()
31 self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4"
32+ self.session.props.ssl_use_system_ca_file = True
33+ self.session.props.ssl_strict = True
34 self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
35 self.preferences = Unity.PreferencesManager.get_default()
36 self.query_list_of_sources()

Subscribers

People subscribed via source and target branches

to all changes: