From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Mon, 17 Jul 2006 09:39:11 +0000 (+0000)
Subject: Use substitions when converting gnome mime files from UTF-8 (bug 1518012)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8dee721efdc49d08f09a9744fd9981a44b2a5b41

Use substitions when converting gnome mime files from UTF-8 (bug 1518012)


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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 55385d3a76..e2e68bd09a 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -280,7 +280,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
 {
     wxTextFile textfile(filename);
 #if defined(__WXGTK20__) && wxUSE_UNICODE
-    if ( !textfile.Open(wxConvUTF8) )
+    if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) )
 #else
     if ( !textfile.Open() )
 #endif