Add code for parsing globs file in /usr/local as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -265,7 +265,7 @@ void wxMimeTypesManagerImpl::LoadXDGGlobs(const wxString& filename)
|
|||||||
wxArrayString exts;
|
wxArrayString exts;
|
||||||
exts.Add( ext );
|
exts.Add( ext );
|
||||||
|
|
||||||
AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, false );
|
AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, true );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -528,6 +528,7 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
|
|||||||
|
|
||||||
// Read MIME type - extension associations
|
// Read MIME type - extension associations
|
||||||
LoadXDGGlobs( "/usr/share/mime/globs" );
|
LoadXDGGlobs( "/usr/share/mime/globs" );
|
||||||
|
LoadXDGGlobs( "/usr/local/share/mime/globs" );
|
||||||
|
|
||||||
// Load desktop files for XDG, and then override them with the defaults.
|
// Load desktop files for XDG, and then override them with the defaults.
|
||||||
// We will override them one desktop file at a time, rather
|
// We will override them one desktop file at a time, rather
|
||||||
|
Reference in New Issue
Block a user