← Back to branch summary

~ps-jenkins/libunity/latestsnapshot-7.1.3+14.04.20131106-0ubuntu1

« back to all changes in this revision

Viewing changes to src/unity-aggregator-scope-private.vala

  • Committer: Tarmac
  • Author(s): Pawel Stolowski
  • Date: 2013-10-24 15:50:06 UTC
  • mfrom: (304.1.6 pass-activation-hints)
  • Revision ID: tarmac-20131024155006-r9wpdg06mlpusuht
Pass hints to AggregatorScope activation handler so that it can access action id if it's a preview action activation. Properly set uri in the activation reply if goto_uri is set. Fixes: https://bugs.launchpad.net/bugs/1243623.

Approved by PS Jenkins bot, Michal Hruby.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/unity-aggregator-scope-private.vala
964
964
    var result_arr_cpy = result_arr;
965
965
    var activation_obj = new AggregatorActivation (channel_id, scope_id,
966
966
                                                   action_type, scope_result);
 
967
    activation_obj.hints = hints;
967
968
 
968
969
    var response = yield owner.activate (activation_obj);
969
970
    if (response != null)
970
971
    {
971
972
      var raw = ActivationReplyRaw ();
972
973
      raw.uri = scope_result.uri;
 
974
      if (response.goto_uri != null)
 
975
      {
 
976
          var stripped = response.goto_uri.strip ();
 
977
          if (stripped != "") raw.uri = stripped;
 
978
      }
973
979
      raw.handled = response.handled;
974
980
      raw.hints = response.get_hints ();
975
981