Merge lp:~stolowski/libunity/activate-result into lp:~unity-team/libunity/libunity-7.0

[Paweł Stołowski]

Added virtual activate_result (ScopeResult result) method to the deprecated scope class to receive full data row on activation. Maintain reverse category mapping to remap category indices from aggregated results back to local category indices of given scope.

Added virtual activate_result (ScopeResult result) method to the deprecated scope class to receive full data row on activation. Maintain reverse category mapping to remap category indices from aggregated results back to local category indices of given scope.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:367
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/59

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/59/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/libunity/activate-result]

367. By Paweł Stołowski on 2013-04-24

Merged libunity-7.0.

[Michal Hruby (mhr3)]

Looks fine, although this is breaking the ABI, so some of the scopes in the PPA might stop working.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-04-16 08:10:48 +0000
+++ configure.ac	2013-04-24 09:46:27 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 6.91.10)
+AC_INIT(libunity, 6.91.11)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 07:12:02 +0000
+++ debian/changelog	2013-04-24 09:46:27 +0000
@@ -1,3 +1,9 @@
+libunity (6.91.11ubuntu1) UNRELEASED; urgency=low
+
+  * New activation API.
+
+ -- Pawel Stolowski <[e-mail]>  Wed, 24 Apr 2013 11:42:12 +0200
+
 libunity (6.91.10ubuntu1daily13.04.23ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
 
   [ Michal Hruby ]

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-04-23 07:11:54 +0000
+++ debian/libunity9.symbols	2013-04-24 09:46:27 +0000
@@ -192,6 +192,8 @@
  unity_dee_result_set_new_with_model@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_dee_result_set_set_flush_model@Base 6.91.10ubuntu1daily13.04.23ubuntu.unity.experimental.certified
  unity_dee_result_set_set_results_model@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
+ unity_deprecated_scope_activate_result@Base 0replaceme
+ unity_deprecated_scope_activate_result_finish@Base 0replaceme
  unity_deprecated_scope_base_construct@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_deprecated_scope_base_create_impl@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
  unity_deprecated_scope_base_export@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified

=== modified file 'src/unity-deprecated-scope-impl.vala'
--- src/unity-deprecated-scope-impl.vala	2013-04-11 15:15:58 +0000
+++ src/unity-deprecated-scope-impl.vala	2013-04-24 09:46:27 +0000
@@ -282,7 +282,7 @@
     switch (action)
     {
       case ActionType.ACTIVATE_RESULT:
-        response = owner.activate_uri (scope_result.uri);
+        response = yield owner.activate_result (scope_result);
         break;
       case ActionType.PREVIEW_RESULT:
         preview = yield owner.preview_result (scope_result);

=== modified file 'src/unity-deprecated-scope.vala'
--- src/unity-deprecated-scope.vala	2013-03-26 15:19:19 +0000
+++ src/unity-deprecated-scope.vala	2013-04-24 09:46:27 +0000
@@ -151,6 +151,13 @@
     return preview;
   }
 
+  public virtual async ActivationResponse? activate_result (ScopeResult result)
+  {
+    // by default we'll emit the activate_uri signal
+    var response = activate_uri (result.uri);
+    return response;
+  }
+
   public DeprecatedScope (string dbus_path_, string id_)
   {
     Object (dbus_path: dbus_path_, id: id_);