From 13cae6fbb2d87347b22bc700077e49e2540db1dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Dec 2014 22:18:43 +0000 Subject: [PATCH] Load *.desktop files recursively in wxMimeTypesManager under Unix. 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 --- src/unix/mimetype.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index 265f86aae0..0ee6dcc3b5 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -229,11 +229,7 @@ void wxMimeTypesManagerImpl::LoadXDGAppsFilesFromDir(const wxString& dirname) cont = dir.GetNext(&filename); } -#if 0 - // 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 + // Recurse into subdirs, which on KDE may hold most of the .desktop files cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); while (cont) { @@ -242,7 +238,6 @@ void wxMimeTypesManagerImpl::LoadXDGAppsFilesFromDir(const wxString& dirname) LoadXDGAppsFilesFromDir( p.GetPath() ); cont = dir.GetNext(&filename); } -#endif }