Merge lp:~stolowski/unity-scope-home/unescape-uri into lp:unity-scope-home

[Paweł Stołowski]

Unescape search query that comes with scopes-query:// uri.

Unescape search query that comes with scopes-query:// uri.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/79/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-home/unescape-uri]

157. By Paweł Stołowski on 2013-08-30

Also utf-validate the query.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/80/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looks good.

review: Approve

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-08-27 14:28:33 +0000
+++ src/scope.vala	2013-08-30 11:41:19 +0000
@@ -530,8 +530,16 @@
     if (activation.action_type == Unity.Protocol.ActionType.ACTIVATE_RESULT &&
         activation.scope_result.uri.has_prefix (SCOPES_QUERY_SCHEMA_PREFIX))
     {
-      
-      return new ActivationResponse.with_search (activation.scope_result.uri.substring (SCOPES_QUERY_SCHEMA_PREFIX.length), null, null);
+      var query = activation.scope_result.uri.substring (SCOPES_QUERY_SCHEMA_PREFIX.length);
+      var escaped_query = GLib.Uri.unescape_string (query);
+      if (escaped_query == null)
+        escaped_query = query;
+      if (!escaped_query.validate ()) {
+        escaped_query = "error: Invalid UTF8";
+        warning ("Invalid UTF8 received from the server");
+      }
+
+      return new ActivationResponse.with_search (escaped_query != null ? escaped_query : query, null, null);
     }
 
     if (!scope_mgr.remote_content_search || sss_client == null ||