fixed priority of the mailcap entries (patch 935954)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 10a646a22151bb605bea9b04171fdc21deec3e20..788980326284dc92c8dcfd4a08354c434282023f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -133,6 +133,9 @@ wxHTML:
 - improved tables and lists layout algorithms (Tim Kosse)
 - <div> handling fix (Xavier Nodet)
 
 - improved tables and lists layout algorithms (Tim Kosse)
 - <div> handling fix (Xavier Nodet)
 

+Unix:
+- fixed priorities of mailcap entries (David Hart)
+

 
 2.5.1
 -----
 
 2.5.1
 -----

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index cae5717219fb55b23e545402fc0bad5eb3cdff17..e677ef3d4d5cb514d1baf6d31e402920619314ab 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -2707,9 +2707,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
             // have we seen this one before?
             int nIndex = m_aTypes.Index(data.type);
 
             // have we seen this one before?
             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]"),