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

search: Don't throw if provider directories don't exist

Browse Source 
There's no /usr/local/share/gnome-shell/search-providers, so don't
throw if we don't find it.
This commit is contained in:
Colin Walters 2013-07-27 10:55:57 -04:00
parent be961cd60e
commit a3236997be
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/remoteSearch.js
View File

@ -116,11 +116,18 @@ function loadRemoteSearchProviders(addProviderCallback) {
dataDirs.forEach(function(dataDir) { dataDirs.forEach(function(dataDir) {
let path = GLib.build_filenamev([dataDir, 'gnome-shell', 'search-providers']); let path = GLib.build_filenamev([dataDir, 'gnome-shell', 'search-providers']);
let dir = Gio.File.new_for_path(path); let dir = Gio.File.new_for_path(path);
let fileEnum = dir.enumerate_children('standard::name,standard::type', let fileEnum;
try {
fileEnum = dir.enumerate_children('standard::name,standard::type',
Gio.FileQueryInfoFlags.NONE, null); Gio.FileQueryInfoFlags.NONE, null);
let info; } catch (e) {
while ((info = fileEnum.next_file(null))) fileEnum = null;
loadRemoteSearchProvider(fileEnum.get_child(info)); }
if (fileEnum != null) {
let info;
while ((info = fileEnum.next_file(null)))
loadRemoteSearchProvider(fileEnum.get_child(info));
}
}); });
let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA }); let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });