Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load *.desktop files recursively in wxMimeTypesManager under Unix.

Browse Source 
Not all .desktop files are directly under /usr/share/applications, some or, in
some cases, most of them, may be under its subdirectories, so look for them
there as well.

See #16703.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-12-05 22:18:43 +00:00
parent 08fedc69ef
commit 13cae6fbb2
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/unix/mimetype.cpp
View File

@@ -229,11 +229,7 @@ void wxMimeTypesManagerImpl::LoadXDGAppsFilesFromDir(const wxString& dirname)
cont = dir.GetNext(&filename); cont = dir.GetNext(&filename);
} }
#if 0 // Recurse into subdirs, which on KDE may hold most of the .desktop files
// RR: I'm not sure this makes any sense. On my system we'll just
// scan the YAST2 and other useless directories
// Look recursively into subdirs
cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS);
while (cont) while (cont)
{ {
@@ -242,7 +238,6 @@ void wxMimeTypesManagerImpl::LoadXDGAppsFilesFromDir(const wxString& dirname)
LoadXDGAppsFilesFromDir( p.GetPath() ); LoadXDGAppsFilesFromDir( p.GetPath() );
cont = dir.GetNext(&filename); cont = dir.GetNext(&filename);
} }
#endif
} }