Fix a memory leak.

[ardour.git] / libs / ardour / filesystem_paths.cc

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index a13b7fc45f32fc81206a8f28723109001e442476..932416ef413afd4e8b403c8833079dc5161baf05 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
@@ -16,6 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include <cstdlib>
 
 #include "pbd/error.h"
 #include "pbd/filesystem_paths.h"
@@ -27,6 +28,8 @@
 
 #define WITH_STATIC_PATHS 1
 
+using namespace PBD;
+
 namespace ARDOUR {
 
 using std::string;
@@ -34,19 +37,30 @@ using std::string;
 sys::path
 user_config_directory ()
 {
-       const string home_dir = Glib::get_home_dir ();
-
-       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);
+       const char* c = 0;
+       sys::path p;
+
+       /* adopt freedesktop standards, and put .ardour3 into $XDG_CONFIG_HOME or ~/.config
+        */
+
+       if ((c = getenv ("XDG_CONFIG_HOME")) != 0) {
+               p = c;
+       } else {
+               const string home_dir = Glib::get_home_dir();
+       
+               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;
@@ -71,13 +85,9 @@ SearchPath
 system_config_search_path ()
 {
 #ifdef WITH_STATIC_PATHS
-
        SearchPath config_path(string(CONFIG_DIR));
-
 #else
-
        SearchPath config_path(system_config_directories());
-
 #endif
 
        config_path.add_subdirectory_to_paths("ardour3");
@@ -89,13 +99,9 @@ SearchPath
 system_data_search_path ()
 {
 #ifdef WITH_STATIC_PATHS
-
        SearchPath data_path(string(DATA_DIR));
-
 #else
-
        SearchPath data_path(system_data_directories());
-
 #endif
 
        data_path.add_subdirectory_to_paths("ardour3");