From d9fa0b5388f25caf4137c3c68532f79376ee3545 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 7 Dec 2007 08:59:15 +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/branches/WX_2_8_BRANCH@50556 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 ff93a23cbf..853b8517d7 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -516,6 +516,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; @@ -908,6 +911,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; @@ -935,6 +942,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; @@ -1034,6 +1044,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);