brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

view-selector: add support for disable-external search setting

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=687491
This commit is contained in:
Cosimo Cecchi 2012-11-01 16:18:12 -04:00
parent cf363171aa
commit f25832d1b6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/viewSelector.js
View File

@ -96,6 +96,7 @@ const ViewSelector = new Lang.Class({
this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA }); this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders)); this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders)); this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
// Default search providers // Default search providers
@ -440,9 +441,13 @@ const ViewSelector = new Lang.Class({
}, },
_shouldUseSearchProvider: function(provider) { _shouldUseSearchProvider: function(provider) {
// the disable-external GSetting only affects remote providers
if (!provider.isRemoteProvider) if (!provider.isRemoteProvider)
return true; return true;
if (this._searchSettings.get_boolean('disable-external'))
return false;
let appId = provider.appInfo.get_id(); let appId = provider.appInfo.get_id();
let disable = this._searchSettings.get_strv('disabled'); let disable = this._searchSettings.get_strv('disabled');
return disable.indexOf(appId) == -1; return disable.indexOf(appId) == -1;