libunity

Merge lp:~mhr3/libunity/no-content-hint into lp:~unity-team/libunity/libunity-7.0

  1. no-content-hint
  2. Merge into libunity-7.0
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 375
Merged at revision: 375
Proposed branch: lp:~mhr3/libunity/no-content-hint
Merge into: lp:~unity-team/libunity/libunity-7.0
Diff against target: 62 lines (+14/-2)
4 files modified
configure.ac (+1/-1)
debian/changelog (+1/-1)
debian/libunity9.symbols (+2/-0)
src/unity-master-scope.vala (+10/-0)
To merge this branch: bzr merge lp:~mhr3/libunity/no-content-hint
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+162004@code.launchpad.net

Commit message

Allow master scopes to set a no content message.

Description of the change

Allow master scopes to set a no content message.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Looks good. +1

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-25 10:31:40 +0000
3+++ configure.ac 2013-05-02 00:26:28 +0000
4@@ -1,5 +1,5 @@
5 # When releasing also remember to update the soname as instructed below
6-AC_INIT(libunity, 6.91.12)
7+AC_INIT(libunity, 6.91.13)
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-25 10:31:40 +0000
14+++ debian/changelog 2013-05-02 00:26:28 +0000
15@@ -1,4 +1,4 @@
16-libunity (6.91.12ubuntu1) UNRELEASED; urgency=low
17+libunity (6.91.13ubuntu1) UNRELEASED; urgency=low
18
19 * New activation API.
20 * Changes to internal APIs.
21
22=== modified file 'debian/libunity9.symbols'
23--- debian/libunity9.symbols 2013-05-01 21:11:56 +0000
24+++ debian/libunity9.symbols 2013-05-02 00:26:28 +0000
25@@ -456,8 +456,10 @@
26 unity_launcher_favorites_lookup@Base 5.0.0
27 unity_layout_hint_get_type@Base 5.90.0
28 unity_master_scope_construct@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
29+ unity_master_scope_get_no_content_hint@Base 0replaceme
30 unity_master_scope_get_type@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
31 unity_master_scope_new@Base 6.91.9daily13.04.10ubuntu.unity.experimental.certified
32+ unity_master_scope_set_no_content_hint@Base 0replaceme
33 unity_movie_preview_construct@Base 5.90.0
34 unity_movie_preview_get_type@Base 5.90.0
35 unity_movie_preview_get_year@Base 5.92.0
36
37=== modified file 'src/unity-master-scope.vala'
38--- src/unity-master-scope.vala 2013-04-30 00:12:08 +0000
39+++ src/unity-master-scope.vala 2013-05-02 00:26:28 +0000
40@@ -30,6 +30,8 @@
41 merge_mode: AggregatorScope.MergeMode.CATEGORY_ID, proxy_filter_hints: true);
42 }
43
44+ public string no_content_hint { get; set; }
45+
46 private Internal.Utils.AsyncOnce<ScopeRegistry> registry_once;
47
48 construct
49@@ -138,6 +140,14 @@
50 }
51
52 if (num_scopes > 0) yield;
53+
54+ if (scope_search.results_model.get_n_rows () == 0
55+ && scope_search.search_context.search_query.strip () == ""
56+ && no_content_hint != null)
57+ {
58+ scope_search.set_reply_hint (Internal.SEARCH_NO_RESULTS_HINT,
59+ new Variant.string (no_content_hint));
60+ }
61 }
62 }
63

Subscribers

People subscribed via source and target branches

to all changes: