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

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
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) Approve
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.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/scope.vala'
--- src/scope.vala 2013-10-25 09:37:35 +0000
+++ src/scope.vala 2016-01-22 18:50:01 +0000
@@ -93,7 +93,7 @@
93 return;93 return;
94 }94 }
9595
96 search_hint = _("Search your computer and online sources");96 update_search_hint ();
9797
98 keywords_search.rebuild ();98 keywords_search.rebuild ();
9999
@@ -145,6 +145,8 @@
145 {145 {
146 debug ("remote-content-search flag changed");146 debug ("remote-content-search flag changed");
147147
148 update_search_hint ();
149
148 if (!scope_mgr.remote_content_search)150 if (!scope_mgr.remote_content_search)
149 {151 {
150 if (smart_scopes_initialized)152 if (smart_scopes_initialized)
@@ -162,6 +164,16 @@
162 } // don't do anything if it got enabled - this will be handled on next search ()164 } // don't do anything if it got enabled - this will be handled on next search ()
163 }165 }
164166
167 internal void update_search_hint ()
168 {
169 debug ("Updating search hint");
170
171 if (!scope_mgr.remote_content_search)
172 search_hint = _("Search your computer");
173 else
174 search_hint = _("Search your computer and online sources");
175 }
176
165 internal void init_sss_client ()177 internal void init_sss_client ()
166 {178 {
167 if (scope_mgr.remote_content_search == false)179 if (scope_mgr.remote_content_search == false)

Subscribers

People subscribed via source and target branches

to all changes: