Merge lp:~mhr3/libunity/pass-up-goto-uri into lp:libunity

[Michal Hruby]

Properly pass goto_uri to activation response.

Properly pass goto_uri to activation response.

This will allow a preview action to let the shell open a URI that isn't the result URI.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good, +1

review: Approve

=== modified file 'src/unity-scope-dbus-impl.vala'
--- src/unity-scope-dbus-impl.vala	2013-08-06 08:24:48 +0000
+++ src/unity-scope-dbus-impl.vala	2013-08-15 15:56:16 +0000
@@ -454,8 +454,12 @@
     if (response == null)
       response = new ActivationResponse (HandledType.NOT_HANDLED);
 
-    // FIXME: pass goto_uri ?
     reply.uri = scope_result.uri;
+    if (response.goto_uri != null)
+    {
+      var stripped = response.goto_uri.strip ();
+      if (stripped != "") reply.uri = stripped;
+    }
     reply.handled = response.handled;
     reply.hints = response.get_hints ();
 

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-08-05 10:01:26 +0000
+++ test/vala/test-scope.vala	2013-08-15 15:56:16 +0000
@@ -114,6 +114,8 @@
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_results_invalidated));
     Test.add_data_func ("/Unit/MasterScope/Activation",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_activation));
+    Test.add_data_func ("/Unit/MasterScope/OverriddenGotoUri",
+        Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_overridden_goto_uri));
     Test.add_data_func ("/Unit/MasterScope/Sorting/Ascending",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_sorting_asc));
     Test.add_data_func ("/Unit/MasterScope/Sorting/Descending",
@@ -1768,6 +1770,47 @@
       assert (activated_scopes.length == 3);
     }
 
+    public void test_master_overridden_goto_uri ()
+    {
+      // we need channel first
+      Dee.SerializableModel model;
+      var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT,
+                                                 out model);
+      ScopeTester.perform_search (proxy, channel_id, "", null, model);
+      assert (model.get_n_rows () == 3);
+
+      // NOTE: the order of the results is not defined, so result1 will not
+      // necesarily belong to child_scopes[0]
+      var iter = model.get_first_iter ();
+      var result = model.get_row (iter, null);
+      var uri = result[Unity.Internal.ResultColumn.URI].get_string ();
+      int scope_index = "childscope_1" in uri ? 0 : ("childscope_2" in uri ? 1 : 2);
+      child_scopes[scope_index].set_activate_func((result, metadata, act_id) =>
+      {
+        return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED,
+                                             "test://overridden_uri");
+      });
+
+      var ml = new MainLoop ();
+      ActivationReplyRaw? reply = null;
+      proxy.activate.begin (channel_id, result,
+                            Unity.Protocol.ActionType.ACTIVATE_RESULT,
+                            new HashTable<string, Variant> (null, null), null,
+                            (obj, res) =>
+      {
+        try
+        {
+          reply = proxy.activate.end (res);
+        }
+        catch (Error err) { assert_not_reached (); }
+        ml.quit ();
+      });
+      assert (run_with_timeout (ml));
+
+      assert (reply != null);
+      assert (reply.uri == "test://overridden_uri");
+    }
+
     public void test_master_sorting_asc ()
     {
       results_per_scope = 100;