A couple GUI tweaks - minor toolbar reorganization, trying to get the width down...

[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 8240073da9eff71dca7990acff856a8c7d981fc1..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;
@@ -62,11 +63,12 @@ void
 ARDOUR_UI::setup_keybindings ()
 {
        install_actions ();
-       editor->register_actions ();
        RedirectBox::register_actions ();
+       
+       std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
 
        try {
-               AccelMap::load (ARDOUR::find_config_file ("ardour.bindings"));
+               AccelMap::load (key_binding_file);
        } catch (...) {
                error << "ardour key bindings file not found" << endmsg;
        }