Skip to content

Compliance with XDG specifications on UNIX systems #2616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mochaaP wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compliance with XDG specifications on UNIX systems #2616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions melder/melder_files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,16 @@ void Melder_getParentPreferencesFolder (MelderFolder preferencesFolder) {
Melder_sprint (preferencesFolder -> path,kMelder_MAXPATH+1, homeFolder. path, U"/Library/Preferences");
#elif defined (UNIX)
/*
Preferences files go into the home folder.
Preferences files go into ${XDG_CONFIG_HOME}.
*/
Melder_getHomeDir (preferencesFolder);
structMelderFolder homeFolder { };
char *xdgConfigHome = getenv ("XDG_CONFIG_HOME");
if (!xdgConfigHome) {
Melder_getHomeDir (& homeFolder);
Melder_sprint (preferencesFolder -> path,kMelder_MAXPATH+1, homeFolder. path, U"/.config");
} else {
Melder_sprint (preferencesFolder -> path,kMelder_MAXPATH+1, Melder_peek8to32 (xdgConfigHome));
}
#elif defined (_WIN32)
/*
On Windows 95, preferences files went into the Windows folder.
Expand Down
2 changes: 1 addition & 1 deletion sys/praat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ void praat_init (conststring32 title, int argc, char **argv)
*/
char32 subfolderName [256];
#if defined (UNIX)
Melder_sprint (subfolderName,256, U".", programName, U"-dir"); // for example .praat-dir
Melder_sprint (subfolderName,256, programName); // for example praat
#elif defined (macintosh)
Melder_sprint (subfolderName,256, praatP.title.get(), U" Prefs"); // for example Praat Prefs
#elif defined (_WIN32)
Expand Down