X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=86f03bbd95ad5c4c9ab755c394bddc78f962f17f;hb=8630fd1703acb2f9a36d6db7e0d18963b461614f;hp=17ba896f1f92f938a8c0e5ed323e368dd212eec6;hpb=24765e845965211e0731c577a2bfcd6f76de9674;p=ardour.git

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 17ba896f1f..86f03bbd95 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -25,13 +25,11 @@
 
 #include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
-#include "pbd/filesystem.h"
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 
 #include "gtkmm2ext/rgb_macros.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
 #include "ui_config.h"
@@ -66,7 +64,7 @@ UIConfiguration::load_defaults ()
 {
 	int found = 0;
 
-	sys::path default_ui_rc_file;
+	std::string default_ui_rc_file;
 	std::string rcfile;
 
 	if (getenv ("ARDOUR_SAE")) {
@@ -75,12 +73,11 @@ UIConfiguration::load_defaults ()
 		rcfile = "ardour3_ui_default.conf";
 	}
 
-	if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-				      rcfile, default_ui_rc_file) ) {
+	if (find_file_in_search_path (ardour_config_search_path(), rcfile, default_ui_rc_file) ) {
 		XMLTree tree;
 		found = 1;
 
-		string rcfile = default_ui_rc_file.to_string();
+		string rcfile = default_ui_rc_file;
 
 		info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 
@@ -105,14 +102,13 @@ UIConfiguration::load_state ()
 {
 	bool found = false;
 
-	sys::path default_ui_rc_file;
+	std::string default_ui_rc_file;
 
-	if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-			"ardour3_ui_default.conf", default_ui_rc_file) ) {
+	if ( find_file_in_search_path (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) {
 		XMLTree tree;
 		found = true;
 
-		string rcfile = default_ui_rc_file.to_string();
+		string rcfile = default_ui_rc_file;
 
 		info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 
@@ -127,14 +123,13 @@ UIConfiguration::load_state ()
 		}
 	}
 
-	sys::path user_ui_rc_file;
+	std::string user_ui_rc_file;
 
-	if (find_file_in_search_path (ardour_search_path() + user_config_directory(),
-			"ardour3_ui.conf", user_ui_rc_file)) {
+	if (find_file_in_search_path (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) {
 		XMLTree tree;
 		found = true;
 
-		string rcfile = user_ui_rc_file.to_string();
+		string rcfile = user_ui_rc_file;
 
 		info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg;
 
@@ -164,18 +159,8 @@ UIConfiguration::save_state()
 {
 	XMLTree tree;
 
-	try {
-		sys::create_directories (user_config_directory ());
-	}
-	catch (const sys::filesystem_error& ex) {
-		error << "Could not create user configuration directory" << endmsg;
-		return -1;
-	}
-
-	sys::path rcfile_path(user_config_directory());
-
-	rcfile_path /= "ardour3_ui.conf";
-	const string rcfile = rcfile_path.to_string();
+	std::string rcfile(user_config_directory());
+	rcfile = Glib::build_filename (rcfile, "ardour3_ui.conf");
 
 	// this test seems bogus?
 	if (rcfile.length()) {