projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert inadvertantly committed stuff from 10322.
[ardour.git]
/
libs
/
ardour
/
filesystem_paths.cc
diff --git
a/libs/ardour/filesystem_paths.cc
b/libs/ardour/filesystem_paths.cc
index 7372c467a65bf2ca3d4dbf43ae4c0883a229d924..5dc5e4dbdef823bb31cf4fc796e5a6a4d37801ec 100644
(file)
--- a/
libs/ardour/filesystem_paths.cc
+++ b/
libs/ardour/filesystem_paths.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2007 Tim Mayberry
+ Copyright (C) 2007 Tim Mayberry
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,6
+16,7
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <cstdlib>
#include "pbd/error.h"
#include "pbd/filesystem_paths.h"
#include "pbd/error.h"
#include "pbd/filesystem_paths.h"
@@
-36,18
+37,30
@@
using std::string;
sys::path
user_config_directory ()
{
sys::path
user_config_directory ()
{
- const string home_dir = Glib::get_home_dir ();
+ const char* c = 0;
+ sys::path p;
- if (home_dir.empty ()) {
- const string error_msg = "Unable to determine home directory";
+ /* adopt freedesktop standards, and put .ardour3 into $XDG_CONFIG_HOME or ~/.config
+ */
- // log the error
- error << error_msg << endmsg;
+ if ((c = getenv ("XDG_CONFIG_HOME")) != 0) {
+ p = c;
+ } else {
+ const string home_dir = Glib::get_home_dir();
- throw sys::filesystem_error(error_msg);
+ if (home_dir.empty ()) {
+ const string error_msg = "Unable to determine home directory";
+
+ // log the error
+ error << error_msg << endmsg;
+
+ throw sys::filesystem_error(error_msg);
+ }
+
+ p = home_dir;
+ p /= ".config";
}
}
- sys::path p(home_dir);
p /= user_config_dir_name;
return p;
p /= user_config_dir_name;
return p;