From 080385d599154e4bd4abbb8a40fb8c6834e3a000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 9 Apr 2009 09:30:33 +0000 Subject: [PATCH] Fixed logic to detect and warn about changes in the system folder. Merged the "system" folder and "system folder or it's contents" case. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30057 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/tracker/FSUtils.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 09faf76bd0..e1ee1b2cbc 100644 --- a/src/kits/tracker/FSUtils.cpp +++ b/src/kits/tracker/FSUtils.cpp @@ -471,18 +471,12 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *action, const char *warning = NULL; bool requireOverride = true; - if (DirectoryMatches(entry, B_BEOS_DIRECTORY)) - warning = "If you %s the system folder, you won't be able to " - "boot " OS_NAME "! Are you sure you want to do this? To %s the folder " - "anyway, hold down the Shift key and click \"Do it\"."; -#ifndef __HAIKU__ - else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY)) + if (DirectoryMatchesOrContains(entry, B_BEOS_DIRECTORY)) { warning = "If you %s the system folder or its contents, you " "won't be able to boot " OS_NAME "! Are you sure you want to do this? " "To %s the system folder or its contents anyway, hold down " "the Shift key and click \"Do it\"."; -#endif - else if (DirectoryMatches(entry, B_USER_DIRECTORY)) { + } else if (DirectoryMatches(entry, B_USER_DIRECTORY)) { warning = "If you %s the home folder, " OS_NAME " may not " "behave properly! Are you sure you want to do this? " "To %s the home anyway, click \"Do it\".";