Merge lp:~stolowski/libunity/new-query-on-activate into lp:libunity

[Paweł Stołowski]

Add a new activation response that tells Unity to issue a new search query.

Add a new activation response that tells Unity to issue a new search query.

Please don't globally approve (pending design review).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/libunity-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/86

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/101/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

78 + public ActivationResponse.do_search (string search_string)

Since this is a constructor and public API, can we make it "ActivationResponse.with_search (string, FilterSet?, SearchMetadata?)" instead? No need to handle the two extra params right now.

56 + DO_SEARCH

PERFORM_ pls :)

Otherwise looking good.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/libunity-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/102/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Changed as suggested.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/libunity-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/103/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looking good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/libunity-ci/106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/106/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libunity-autolanding/69/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1832
    FAILURE: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-autolanding/64/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-autolanding/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-autolanding/64

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-27 09:40:19 +0000
+++ debian/changelog	2013-08-27 14:22:09 +0000
@@ -2,6 +2,7 @@
 
   [ Pawel Stolowski ]
   * Removed openweathermap scope from list of client scopes.
+  * Support new search on activation request.
 
   [ Michal Hruby ]
   * Added colorize API to AnnotatedIcon.

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-08-27 09:40:19 +0000
+++ debian/libunity9.symbols	2013-08-27 14:22:09 +0000
@@ -61,6 +61,7 @@
  unity_abstract_scope_normalize_search_query@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_abstract_scope_results_invalidated@Base 7.0.9+13.10.20130723
  unity_activation_response_construct@Base 4.0.0
+ unity_activation_response_construct_with_search@Base 0replaceme
  unity_activation_response_construct_with_preview@Base 5.90.0
  unity_activation_response_get_goto_uri@Base 4.0.0
  unity_activation_response_get_handled@Base 4.0.0
@@ -68,6 +69,7 @@
  unity_activation_response_get_preview@Base 5.90.0
  unity_activation_response_get_type@Base 4.0.0
  unity_activation_response_new@Base 4.0.0
+ unity_activation_response_new_with_search@Base 0replaceme
  unity_activation_response_new_with_preview@Base 5.90.0
  unity_activation_response_set_goto_uri@Base 4.0.0
  unity_activation_response_set_preview@Base 5.90.0

=== modified file 'protocol/protocol-scope-interface.vala'
--- protocol/protocol-scope-interface.vala	2013-07-16 17:23:39 +0000
+++ protocol/protocol-scope-interface.vala	2013-08-27 14:22:09 +0000
@@ -37,7 +37,8 @@
   SHOW_DASH,
   HIDE_DASH,
   GOTO_DASH_URI,
-  SHOW_PREVIEW
+  SHOW_PREVIEW,
+  PERFORM_SEARCH
 }
 
 public enum ActionType

=== modified file 'src/unity-result-activation.vala'
--- src/unity-result-activation.vala	2013-03-11 18:36:48 +0000
+++ src/unity-result-activation.vala	2013-08-27 14:22:09 +0000
@@ -37,7 +37,8 @@
   SHOW_DASH,
   HIDE_DASH,
   GOTO_DASH_URI,
-  SHOW_PREVIEW
+  SHOW_PREVIEW,
+  PERFORM_SEARCH
 }
 
 public class ActivationResponse : Object
@@ -50,6 +51,13 @@
     Object (handled:handled, goto_uri:goto_uri);
   }
 
+  public ActivationResponse.with_search (string search_string, FilterSet? filter_set, SearchMetadata? search_metadata)
+  {
+    // filter_set and search_metadata are not currently handled
+    Object (handled:HandledType.PERFORM_SEARCH);
+    _new_query = search_string;
+  }
+
   public ActivationResponse.with_preview (Preview preview)
   {
     Object (handled:HandledType.SHOW_PREVIEW);
@@ -57,6 +65,7 @@
   }
 
   private Preview _preview;
+  private string? _new_query;
 
   internal HashTable<string, Variant> get_hints ()
   {
@@ -66,6 +75,8 @@
       hash["goto-uri"] = goto_uri;
     if (_preview != null)
       hash["preview"] = _preview.serialize ();
+    if (_new_query != null)
+      hash["query"] = _new_query;
 
     return hash;
   }