finddir: Add SYSTEM_DESKBAR_DIRECTORY
* Resolves #18883 Change-Id: Ib971272319d55b37fa06d6874f257c8080bdab8f Reviewed-on: https://review.haiku-os.org/c/haiku/+/7611 Reviewed-by: waddlesplash <[email protected]> Reviewed-by: nephele nephele <[email protected]> Reviewed-by: Alexander von Gluck <[email protected]> Reviewed-by: Fredrik Holmqvist <[email protected]> Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
@@ -32,6 +32,7 @@ typedef enum {
|
||||
B_SYSTEM_DEVELOP_DIRECTORY,
|
||||
B_SYSTEM_PACKAGES_DIRECTORY,
|
||||
B_SYSTEM_HEADERS_DIRECTORY,
|
||||
B_SYSTEM_DESKBAR_DIRECTORY,
|
||||
|
||||
B_SYSTEM_ETC_DIRECTORY = 2008,
|
||||
B_SYSTEM_SETTINGS_DIRECTORY = 2010,
|
||||
|
||||
@@ -50,6 +50,7 @@ directoryType directoryTypes[] = {
|
||||
KEYVALUE_PAIR(B_SYSTEM_DEVELOP_DIRECTORY),
|
||||
KEYVALUE_PAIR(B_SYSTEM_PACKAGES_DIRECTORY),
|
||||
KEYVALUE_PAIR(B_SYSTEM_HEADERS_DIRECTORY),
|
||||
KEYVALUE_PAIR(B_SYSTEM_DESKBAR_DIRECTORY),
|
||||
|
||||
// Writable system directories
|
||||
KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
|
||||
|
||||
@@ -103,6 +103,7 @@ static const char *kSystemDirectories[] = {
|
||||
SYSTEM "/develop",
|
||||
SYSTEM "/packages",
|
||||
SYSTEM "/develop/headers$a",
|
||||
SYSTEM "/data/deskbar/menu",
|
||||
};
|
||||
|
||||
/* Common directories, shared among users */
|
||||
@@ -358,6 +359,7 @@ __find_directory(directory_which which, dev_t device, bool createIt,
|
||||
case B_SYSTEM_DEVELOP_DIRECTORY:
|
||||
case B_SYSTEM_PACKAGES_DIRECTORY:
|
||||
case B_SYSTEM_HEADERS_DIRECTORY:
|
||||
case B_SYSTEM_DESKBAR_DIRECTORY:
|
||||
templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY];
|
||||
break;
|
||||
|
||||
@@ -565,6 +567,7 @@ __find_directory(directory_which which, dev_t device, bool createIt,
|
||||
case B_SYSTEM_DEVELOP_DIRECTORY:
|
||||
case B_SYSTEM_PACKAGES_DIRECTORY:
|
||||
case B_SYSTEM_HEADERS_DIRECTORY:
|
||||
case B_SYSTEM_DESKBAR_DIRECTORY:
|
||||
templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY];
|
||||
break;
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@ const directory_which directories[] = {
|
||||
B_SYSTEM_SPOOL_DIRECTORY,
|
||||
B_SYSTEM_TEMP_DIRECTORY,
|
||||
B_SYSTEM_VAR_DIRECTORY,
|
||||
B_SYSTEM_DESKBAR_DIRECTORY,
|
||||
// User directories. These are interpreted in the context
|
||||
// of the user making the find_directory call.
|
||||
B_USER_DIRECTORY,
|
||||
@@ -231,6 +232,9 @@ test_find_directory(directory_which dir, BPath &path, dev_t device)
|
||||
case B_SYSTEM_VAR_DIRECTORY:
|
||||
error = path.SetTo("/boot/var");
|
||||
break;
|
||||
case B_SYSTEM_DESKBAR_DIRECTORY:
|
||||
error = path.SetTo("/boot/system/data/deskbar/menu");
|
||||
break;
|
||||
// User directories. These are interpreted in the context
|
||||
// of the user making the find_directory call.
|
||||
case B_USER_DIRECTORY:
|
||||
|
||||
Reference in New Issue
Block a user