Large nasty commit in the form of a 5000 line patch chock-full of completely

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index dc69ce84835bce14a2d1f8e65e9fddd7bb2cb8a7..0603fc6baa5acb95ee365736ac18eb2be21734c1 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -36,6 +36,7 @@
 
 using namespace sigc;
 using namespace Gtk;
+using namespace PBD;
 
 namespace ARDOUR {
        class Session;
@@ -64,12 +65,8 @@ ARDOUR_UI::setup_keybindings ()
        install_actions ();
        RedirectBox::register_actions ();
        
-       std::string key_binding_file = Glib::getenv(X_("ARDOUR_BINDINGS"));
+       std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
 
-       if(!Glib::file_test(key_binding_file, Glib::FILE_TEST_EXISTS)) key_binding_file = ARDOUR::find_config_file("ardour.bindings");
-
-       std::cout << "Loading key binding file " << key_binding_file << std::endl;
-       
        try {
                AccelMap::load (key_binding_file);
        } catch (...) {