X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=98ffab1160bb563fa2a2f5abf868062f6d10e281;hb=00e1b1410c98e96a283ff4f4ab87dad2f8d1e5a2;hp=41e6a088145676a0d906dc8deca313e47b090320;hpb=4bd528798073c8e168e9f17df6246255f653e079;p=ardour.git

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 41e6a08814..98ffab1160 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -59,10 +59,7 @@ ArdourKeyboard::setup_keybindings ()
 
 	/* set up the per-user bindings path */
 
-	sys::path p (user_config_directory ());
-	p /= "ardour.bindings";
-
-	user_keybindings_path = p.to_string ();
+	user_keybindings_path = Glib::build_filename (user_config_directory(), "ardour.bindings");
 
 	if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) {
 		std::pair<string,string> newpair;
@@ -124,11 +121,9 @@ ArdourKeyboard::setup_keybindings ()
 		if (!Glib::path_is_absolute (keybindings_path)) {
 
 			/* not absolute - look in the usual places */
-			sys::path keybindings_file;
-
-			SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
+			std::string keybindings_file;
 
-			if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
+			if ( ! find_file_in_search_path (ardour_config_search_path(), keybindings_path, keybindings_file)) {
 
 				if (keybindings_path == default_bindings) {
 					error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
@@ -144,7 +139,7 @@ ArdourKeyboard::setup_keybindings ()
 
 				/* use it */
 
-				keybindings_path = keybindings_file.to_string();
+				keybindings_path = keybindings_file;
 				break;
 
 			}