silently ignore any X-fields in mime.types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2185,15 +2185,19 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
|
|||||||
else if ( strLHS == wxT("exts") ) {
|
else if ( strLHS == wxT("exts") ) {
|
||||||
strExtensions = strRHS;
|
strExtensions = strRHS;
|
||||||
}
|
}
|
||||||
else {
|
else if ( strLHS != _T("icon") )
|
||||||
|
{
|
||||||
// this one is simply ignored: it usually refers to Netscape
|
// this one is simply ignored: it usually refers to Netscape
|
||||||
// built in icons which are useless for us anyhow
|
// built in icons which are useless for us anyhow
|
||||||
if ( strLHS != _T("icon") )
|
}
|
||||||
{
|
else if ( !strLHS.StartsWith(_T("x-")) )
|
||||||
// This crashes for some reason in wcslen() in libc. RR.
|
{
|
||||||
// wxLogWarning(_("Unknown field in file %s, line %d: '%s'."),
|
// we suppose that all fields starting with "X-" are
|
||||||
// strFileName.c_str(), nLine + 1, strLHS.c_str());
|
// unregistered extensions according to the standard practice,
|
||||||
}
|
// but it may be worth telling the user about other junk in
|
||||||
|
// his mime.types file
|
||||||
|
wxLogWarning(_("Unknown field in file %s, line %d: '%s'."),
|
||||||
|
strFileName.c_str(), nLine + 1, strLHS.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !entryEnded ) {
|
if ( !entryEnded ) {
|
||||||
|
Reference in New Issue
Block a user