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

Proposed by Paweł Stołowski on 2013-04-23
Status: Merged
Approved by: Michal Hruby on 2013-04-24
Approved revision: 367
Merged at revision: 367
Proposed branch: lp:~stolowski/libunity/activate-result
Merge into: lp:~unity-team/libunity/libunity-7.0
Diff against target: 68 lines (+17/-2)
5 files modified
configure.ac (+1/-1)
debian/changelog (+6/-0)
debian/libunity9.symbols (+2/-0)
src/unity-deprecated-scope-impl.vala (+1/-1)
src/unity-deprecated-scope.vala (+7/-0)
To merge this branch: bzr merge lp:~stolowski/libunity/activate-result
Reviewer Review Type Date Requested Status
Michal Hruby (community) 2013-04-23 Approve on 2013-04-24
PS Jenkins bot (community) continuous-integration Approve on 2013-04-23
Review via email: mp+160434@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
367. By Paweł Stołowski on 2013-04-24

Merged libunity-7.0.

Michal Hruby (mhr3) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-04-16 08:10:48 +0000
3+++ configure.ac 2013-04-24 09:46:27 +0000
4@@ -1,5 +1,5 @@
5 # When releasing also remember to update the soname as instructed below
6-AC_INIT(libunity, 6.91.10)
7+AC_INIT(libunity, 6.91.11)
8
9 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
10 AM_CONFIG_HEADER(config.h)
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2013-04-23 07:12:02 +0000
14+++ debian/changelog 2013-04-24 09:46:27 +0000
15@@ -1,3 +1,9 @@
16+libunity (6.91.11ubuntu1) UNRELEASED; urgency=low
17+
18+ * New activation API.
19+
20+ -- Pawel Stolowski <pawel.stolowski@canonical.com> Wed, 24 Apr 2013 11:42:12 +0200
21+
22 libunity (6.91.10ubuntu1daily13.04.23ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
23
24 [ Michal Hruby ]
25
26=== modified file 'debian/libunity9.symbols'
27--- debian/libunity9.symbols 2013-04-23 07:11:54 +0000
28+++ debian/libunity9.symbols 2013-04-24 09:46:27 +0000
29@@ -192,6 +192,8 @@
30 unity_dee_result_set_new_with_model@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
31 unity_dee_result_set_set_flush_model@Base 6.91.10ubuntu1daily13.04.23ubuntu.unity.experimental.certified
32 unity_dee_result_set_set_results_model@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
33+ unity_deprecated_scope_activate_result@Base 0replaceme
34+ unity_deprecated_scope_activate_result_finish@Base 0replaceme
35 unity_deprecated_scope_base_construct@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
36 unity_deprecated_scope_base_create_impl@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
37 unity_deprecated_scope_base_export@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
38
39=== modified file 'src/unity-deprecated-scope-impl.vala'
40--- src/unity-deprecated-scope-impl.vala 2013-04-11 15:15:58 +0000
41+++ src/unity-deprecated-scope-impl.vala 2013-04-24 09:46:27 +0000
42@@ -282,7 +282,7 @@
43 switch (action)
44 {
45 case ActionType.ACTIVATE_RESULT:
46- response = owner.activate_uri (scope_result.uri);
47+ response = yield owner.activate_result (scope_result);
48 break;
49 case ActionType.PREVIEW_RESULT:
50 preview = yield owner.preview_result (scope_result);
51
52=== modified file 'src/unity-deprecated-scope.vala'
53--- src/unity-deprecated-scope.vala 2013-03-26 15:19:19 +0000
54+++ src/unity-deprecated-scope.vala 2013-04-24 09:46:27 +0000
55@@ -151,6 +151,13 @@
56 return preview;
57 }
58
59+ public virtual async ActivationResponse? activate_result (ScopeResult result)
60+ {
61+ // by default we'll emit the activate_uri signal
62+ var response = activate_uri (result.uri);
63+ return response;
64+ }
65+
66 public DeprecatedScope (string dbus_path_, string id_)
67 {
68 Object (dbus_path: dbus_path_, id: id_);

Subscribers

People subscribed via source and target branches

to all changes: