MESCLUN: new SAE-specific bindings file; parametized binding files; fix handling of master source info loading from XML; change rubberband stretch progress reporting; better handling of top level menubar accelerators on Quartz; fixup handling of user-specified bindings file; no more audition on double-click in region list (does rename instead); various OS X specific fixups; partial fix for memory leakage in import code (fixed by timbyr in trunk but not back-portable to 2.X)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2716 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 18 insertions, 1 deletions

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 047f692546..6dd957993d 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -280,7 +280,24 @@ int main (int argc, char* argv[])
 	}
 
 	if (!keybindings_path.empty()) {
-		ui->set_keybindings_path (keybindings_path);
+		std::string path;
+
+		// XXX timbyr - we need a portable test for "is-absolute" here 
+
+		if (keybindings_path[0] != '/' && keybindings_path[0] != '.') {
+			path = find_config_file (keybindings_path);
+			if (path.empty()) {
+				warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
+							   keybindings_path)
+					<< endmsg;
+			}
+		} else {
+			path = keybindings_path;
+		}
+
+		if (!path.empty()) {
+			ui->set_keybindings_path (path);
+		}
 	}
 
 	ui->run (text_receiver);