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

fixed priority of the mailcap entries (patch 935954)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-15 22:07:47 +00:00
parent 0e6450e172
commit a9a76b2fb8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.txt
View File

@@ -133,6 +133,9 @@ wxHTML:
- improved tables and lists layout algorithms (Tim Kosse) - improved tables and lists layout algorithms (Tim Kosse)
- <div> handling fix (Xavier Nodet) - <div> handling fix (Xavier Nodet)
Unix:
- fixed priorities of mailcap entries (David Hart)
2.5.1 2.5.1
----- -----

5
src/unix/mimetype.cpp
View File

@@ -2707,9 +2707,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
// have we seen this one before? // have we seen this one before?
int nIndex = m_aTypes.Index(data.type); int nIndex = m_aTypes.Index(data.type);
// and if we have, was it in this file? // and if we have, was it in this file? if not, we should
// overwrite the previously seen one
overwrite = nIndex == wxNOT_FOUND || overwrite = nIndex == wxNOT_FOUND ||
aIndicesSeenHere.Index(nIndex) != wxNOT_FOUND; aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;
} }
wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"), wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),