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

Use KDE 4 and 5 directories in Unix wxMimeTypesManager too

Browse Source 
KDE 3 is throughly outdated, but keep support for it too because it
doesn't cost much.

Closes #16704.
This commit is contained in:
Vadim Zeitlin
2018-01-30 23:01:39 +01:00
parent a0cc098ef0
commit 2ff1e633e9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/unix/mimetype.cpp
View File

@@ -520,10 +520,13 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
} }
static void AppendToPathIfExists(wxString& pathvar, const wxString& dir) static bool AppendToPathIfExists(wxString& pathvar, const wxString& dir)
{ {
if ( wxFileName::DirExists(dir) ) if ( !wxFileName::DirExists(dir) )
pathvar << ":" << dir; return false;
pathvar << ":" << dir;
return true;
} }
// read system and user mailcaps and other files // read system and user mailcaps and other files
@@ -560,8 +563,17 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
if ( mailcapStyles & wxMAILCAP_KDE ) if ( mailcapStyles & wxMAILCAP_KDE )
{ {
AppendToPathIfExists(xdgDataDirs, "/usr/share/kde3"); for ( int kdeVer = 5; kdeVer >= 3; kdeVer-- )
AppendToPathIfExists(xdgDataDirs, "/opt/kde3/share"); {
const wxString& kdeDir = wxString::Format("kde%d", kdeVer);
if ( AppendToPathIfExists(xdgDataDirs, "/usr/share/" + kdeDir)
|| AppendToPathIfExists(xdgDataDirs, "/opt/" + kdeDir + "/share") )
{
// We don't need to use earlier versions if we found a
// later one.
break;
}
}
} }
} }
if ( !sExtraDir.empty() ) if ( !sExtraDir.empty() )