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

Use only existing directories in Unix wxMimeTypesManager

Browse Source 
Avoid using directories under /opt if they don't exist anyhow.

This also makes the code easier to modify in the future, see #16704.
This commit is contained in:
Vadim Zeitlin
2018-01-30 22:58:08 +01:00
parent 9f57b6ed20
commit a0cc098ef0
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/unix/mimetype.cpp
View File

@@ -520,6 +520,11 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
} }
static void AppendToPathIfExists(wxString& pathvar, const wxString& dir)
{
if ( wxFileName::DirExists(dir) )
pathvar << ":" << dir;
}
// read system and user mailcaps and other files // read system and user mailcaps and other files
void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
@@ -546,10 +551,18 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
if ( xdgDataDirs.empty() ) if ( xdgDataDirs.empty() )
{ {
xdgDataDirs = "/usr/local/share:/usr/share"; xdgDataDirs = "/usr/local/share:/usr/share";
if (mailcapStyles & wxMAILCAP_GNOME)
xdgDataDirs += ":/usr/share/gnome:/opt/gnome/share"; if ( mailcapStyles & wxMAILCAP_GNOME )
if (mailcapStyles & wxMAILCAP_KDE) {
xdgDataDirs += ":/usr/share/kde3:/opt/kde3/share"; AppendToPathIfExists(xdgDataDirs, "/usr/share/gnome");
AppendToPathIfExists(xdgDataDirs, "/opt/gnome/share");
}
if ( mailcapStyles & wxMAILCAP_KDE )
{
AppendToPathIfExists(xdgDataDirs, "/usr/share/kde3");
AppendToPathIfExists(xdgDataDirs, "/opt/kde3/share");
}
} }
if ( !sExtraDir.empty() ) if ( !sExtraDir.empty() )
{ {