X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=98ffab1160bb563fa2a2f5abf868062f6d10e281;hb=43ae996b3a18ecad15f6fe872c4194d23b2200cf;hp=99b24f6e01e38632718ebcb4d938caf90d59ae77;hpb=b5148d93d5a9e6949f82f8685cab50cb772f2b9d;p=ardour.git

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 99b24f6e01..98ffab1160 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -59,11 +59,7 @@ ArdourKeyboard::setup_keybindings ()
 
 	/* set up the per-user bindings path */
 
-	strs.push_back (Glib::get_home_dir());
-	strs.push_back (".ardour3");
-	strs.push_back ("ardour.bindings");
-
-	user_keybindings_path = Glib::build_filename (strs);
+	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;
@@ -125,14 +121,12 @@ 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 << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+					error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
 					return;
 				} else {
 					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
@@ -145,7 +139,7 @@ ArdourKeyboard::setup_keybindings ()
 
 				/* use it */
 
-				keybindings_path = keybindings_file.to_string();
+				keybindings_path = keybindings_file;
 				break;
 
 			}
@@ -156,7 +150,7 @@ ArdourKeyboard::setup_keybindings ()
 
 			if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) {
 				if (keybindings_path == default_bindings) {
-					error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+					error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
 					return;
 				} else {
 					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),