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

[Timo Jyrinki]

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

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

[Timo Jyrinki (timo-jyrinki)]

Identical to the precise request at https://code.launchpad.net/~unity-team/unity-lens-video/unity-scope-video-remote-precise/+merge/158864

[Sebastien Bacher (seb128)]

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)]

thank you, done

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