From afaee31547a44817f06db4456d46a8e50c8f66c6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 18 Dec 2000 16:16:30 +0000 Subject: [PATCH] fix to parse the new GNOME .keys files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/mimetype.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index 1b8cf25097..573747fe13 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -322,6 +322,9 @@ ArrayIconHandlers wxMimeTypesManagerImpl::ms_iconHandlers; // with blank lines separating the entries and indented lines starting with // TABs. We're interested in the field icon-filename whose value is the path // containing the icon. +// +// Update (Chris Elliott): apparently there may be an optional "[lang]" prefix +// just before the field name. void wxGNOMEIconHandler::LoadIconsFromKeyFile(const wxString& filename) { @@ -389,6 +392,16 @@ void wxGNOMEIconHandler::LoadIconsFromKeyFile(const wxString& filename) // this is a field=value ling pc++; // skip leading TAB + // skip optional "[lang]" + if ( *pc == _T('[') ) + { + while ( *pc ) + { + if ( *pc++ == _T(']') ) + break; + } + } + static const int lenField = 13; // strlen("icon-filename") if ( wxStrncmp(pc, _T("icon-filename"), lenField) == 0 ) { -- 2.45.2