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

It turns out there was a change to mimetype.h (addition of

Browse Source 
parameters) so must revert the previous backport.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-06 19:09:15 +00:00
parent e5490e6eb8
commit 094cb15ba0
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/unix/mimetype.cpp
View File

@@ -529,8 +529,7 @@ bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index)
} }
void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename)
const wxArrayString& dirs)
{ {
wxTextFile textfile(filename); wxTextFile textfile(filename);
#if defined(__WXGTK20__) && wxUSE_UNICODE #if defined(__WXGTK20__) && wxUSE_UNICODE
@@ -565,29 +564,10 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
wxString sTmp(pc); wxString sTmp(pc);
if (sTmp.Contains(wxT("=")) ) if (sTmp.Contains(wxT("=")) )
{ {
// GNOME 1:
if (sTmp.Contains( wxT("icon-filename=") ) ) if (sTmp.Contains( wxT("icon-filename=") ) )
{ {
curIconFile = sTmp.AfterFirst(wxT('=')); curIconFile = sTmp.AfterFirst(wxT('='));
} }
// GNOME 2:
else if (sTmp.Contains( wxT("icon_filename=") ) )
{
curIconFile = sTmp.AfterFirst(wxT('='));
if (!wxFileExists(curIconFile))
{
size_t nDirs = dirs.GetCount();
for (size_t nDir = 0; nDir < nDirs; nDir++)
{
wxString newFile;
newFile.Printf(wxT("%s/pixmaps/document-icons/%s.png"),
dirs[nDir].c_str(),
curIconFile.c_str());
if (wxFileExists(newFile))
curIconFile = newFile;
}
}
}
else //: some other field, else //: some other field,
{ {
//may contain lines like this (RH7) //may contain lines like this (RH7)
@@ -731,8 +711,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file
} }
void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir( void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(const wxString& dirbase)
const wxString& dirbase, const wxArrayString& dirs)
{ {
wxASSERT_MSG( !!dirbase && !wxEndsWithPathSeparator(dirbase), wxASSERT_MSG( !!dirbase && !wxEndsWithPathSeparator(dirbase),
_T("base directory shouldn't end with a slash") ); _T("base directory shouldn't end with a slash") );
@@ -762,7 +741,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
cont = dir.GetFirst(&filename, _T("*.keys"), wxDIR_FILES); cont = dir.GetFirst(&filename, _T("*.keys"), wxDIR_FILES);
while ( cont ) while ( cont )
{ {
LoadGnomeDataFromKeyFile(dirname + filename, dirs); LoadGnomeDataFromKeyFile(dirname + filename);
cont = dir.GetNext(&filename); cont = dir.GetNext(&filename);
} }
@@ -773,6 +752,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir) void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
{ {
wxArrayString dirs; wxArrayString dirs;
dirs.Add(wxT("/usr/share")); dirs.Add(wxT("/usr/share"));
dirs.Add(wxT("/usr/local/share")); dirs.Add(wxT("/usr/local/share"));
@@ -786,7 +766,7 @@ void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
size_t nDirs = dirs.GetCount(); size_t nDirs = dirs.GetCount();
for ( size_t nDir = 0; nDir < nDirs; nDir++ ) for ( size_t nDir = 0; nDir < nDirs; nDir++ )
{ {
LoadGnomeMimeFilesFromDir(dirs[nDir], dirs); LoadGnomeMimeFilesFromDir(dirs[nDir]);
} }
} }
@@ -941,9 +921,6 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
wxMimeTextFile file; wxMimeTextFile file;
if ( !file.Open(dirbase + filename) ) return; if ( !file.Open(dirbase + filename) ) return;
wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
(dirbase+filename).c_str());
wxMimeTypeCommands * entry = new wxMimeTypeCommands; wxMimeTypeCommands * entry = new wxMimeTypeCommands;
wxArrayString sExts; wxArrayString sExts;
wxString mimetype, mime_desc, strIcon; wxString mimetype, mime_desc, strIcon;
@@ -1014,7 +991,6 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
if ( nIndex != wxNOT_FOUND ) if ( nIndex != wxNOT_FOUND )
{ {
strIcon = file.GetCmd(nIndex); strIcon = file.GetCmd(nIndex);
wxLogTrace(TRACE_MIME, wxT(" icon %s"), strIcon.c_str());
//it could be the real path, but more often a short name //it could be the real path, but more often a short name
if (!wxFileExists(strIcon)) if (!wxFileExists(strIcon))
{ {
@@ -1028,7 +1004,6 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
if (wxFileExists(icondirs[nDir] + strIcon)) if (wxFileExists(icondirs[nDir] + strIcon))
{ {
strIcon.Prepend(icondirs[nDir]); strIcon.Prepend(icondirs[nDir]);
wxLogTrace(TRACE_MIME, wxT(" iconfile %s"), strIcon.c_str());
break; break;
} }
} }
@@ -1067,9 +1042,6 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase,
if ( !dir.IsOpened() ) if ( !dir.IsOpened() )
return; return;
wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s ---"),
dirname.c_str());
dirname += _T('/'); dirname += _T('/');
wxString filename; wxString filename;