From 6fc93e9bddacdce92910bebb4f13bc6d9f6baf6c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 7 Dec 2007 08:58:49 +0000 Subject: [PATCH] Don't show messages for directories that can't be read since some users will think it's scanning their system git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50555 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 e85d76f28e..04110d67c2 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -495,6 +495,9 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir( wxString dirname = dirbase; dirname << wxT("/mime-info"); + // Don't complain if we don't have permissions to read - it confuses users + wxLogNull logNull; + if ( !wxDir::Exists(dirname) ) return; @@ -887,6 +890,10 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase, { wxFileName dirname(dirbase, wxEmptyString); dirname.AppendDir(subdir); + + // Don't complain if we don't have permissions to read - it confuses users + wxLogNull logNull; + wxDir dir(dirname.GetPath()); if(! dir.IsOpened()) return; @@ -914,6 +921,9 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase, void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirname, const wxArrayString& icondirs) { + // Don't complain if we don't have permissions to read - it confuses users + wxLogNull logNull; + if(! wxDir::Exists(dirname)) return; @@ -1013,6 +1023,9 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) void wxMimeTypesManagerImpl::LoadKDEAppsFilesFromDir(const wxString& dirname) { + // Don't complain if we don't have permissions to read - it confuses users + wxLogNull logNull; + if(! wxDir::Exists(dirname)) return; wxDir dir(dirname); -- 2.45.2