From 7efe2f0eca562c8d3bece9b4a0e00648cfe8a5c0 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Wed, 27 Jun 2007 12:12:36 +0000
Subject: [PATCH] Use PBD::find_file_in_search_path instead of
 ARDOUR::find_config_file to find key bindings file

git-svn-id: svn://localhost/ardour2/trunk@2058 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour_ui.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2b6310327a..9798ff9234 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -40,6 +40,7 @@
 #include <pbd/failed_constructor.h>
 #include <pbd/enumwriter.h>
 #include <pbd/memento_command.h>
+#include <pbd/file_utils.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -67,6 +68,7 @@
 #include <ardour/port.h>
 #include <ardour/audio_track.h>
 #include <ardour/midi_track.h>
+#include <ardour/filesystem_paths.h>
 
 #include "actions.h"
 #include "ardour_ui.h"
@@ -189,9 +191,15 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	have_disk_speed_dialog_displayed = false;
 	session_loaded = false;
 	last_speed_displayed = -1.0f;
-	keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
 	ab_direction = true;
 
+	sys::path key_bindings_file;
+
+	find_file_in_search_path (ardour_search_path() + system_config_search_path(),
+			"ardour.bindings", key_bindings_file);
+
+	keybindings_path = key_bindings_file.to_string();
+
 	can_save_keybindings = false;
 
 	last_configure_time.tv_sec = 0;