Merge lp:~azzar1/unity-scope-home/lp-1536590 into lp:unity-scope-home

Proposed by Andrea Azzarone on 2016-01-22
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-02-10
Approved revision: 182
Merged at revision: 182
Proposed branch: lp:~azzar1/unity-scope-home/lp-1536590
Merge into: lp:unity-scope-home
Diff against target: 38 lines (+13/-1)
1 file modified
src/scope.vala (+13/-1)
To merge this branch: bzr merge lp:~azzar1/unity-scope-home/lp-1536590
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-01-22 Approve on 2016-02-02
Review via email: mp+283680@code.launchpad.net

Commit message

Update search hint if online search is enabled/disabled.

Description of the change

Update search hint if online search is enabled/disabled.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scope.vala'
2--- src/scope.vala 2013-10-25 09:37:35 +0000
3+++ src/scope.vala 2016-01-22 18:50:01 +0000
4@@ -93,7 +93,7 @@
5 return;
6 }
7
8- search_hint = _("Search your computer and online sources");
9+ update_search_hint ();
10
11 keywords_search.rebuild ();
12
13@@ -145,6 +145,8 @@
14 {
15 debug ("remote-content-search flag changed");
16
17+ update_search_hint ();
18+
19 if (!scope_mgr.remote_content_search)
20 {
21 if (smart_scopes_initialized)
22@@ -162,6 +164,16 @@
23 } // don't do anything if it got enabled - this will be handled on next search ()
24 }
25
26+ internal void update_search_hint ()
27+ {
28+ debug ("Updating search hint");
29+
30+ if (!scope_mgr.remote_content_search)
31+ search_hint = _("Search your computer");
32+ else
33+ search_hint = _("Search your computer and online sources");
34+ }
35+
36 internal void init_sss_client ()
37 {
38 if (scope_mgr.remote_content_search == false)

Subscribers

People subscribed via source and target branches

to all changes: