remove method and inline its contents. Nothing gained by wrapping this up

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c6fdd4f87a5939ed882af70cf12343885b1ab793..a52233484053ed8d7707bc891d0a35604f921c39 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -5918,14 +5918,6 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
        return true;
 }
 
-void
-ARDOUR_UI::load_bindings ()
-{
-       if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
-               error << _("Global keybindings are missing") << endmsg;
-       }
-}
-
 void
 ARDOUR_UI::cancel_solo ()
 {

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 6e4ea359088b83b7ac429570fb9b5664492651be..633cdd06a6756614e1a0077502718e0f448fb233 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -861,7 +861,6 @@ private:
        bool main_window_delete_event (GdkEventAny*);
        bool idle_ask_about_quit ();
 
-       void load_bindings ();
        bool tabbable_visibility_button_press (GdkEventButton* ev, std::string const& tabbable_name);
 
        void step_up_through_tabs ();

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index ab2c3a9ef8f4f15d98728ac8ae5964c3642c675e..3578f6f0d54a9a7e63b5b37878febec905014c40 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -60,12 +60,21 @@ namespace ARDOUR {
 }
 
 using namespace ARDOUR;
+using namespace Gtkmm2ext;
 
 void
 ARDOUR_UI::we_have_dependents ()
 {
        install_actions ();
-       load_bindings ();
+
+       /* other windows and related key-event-handling contexts have already
+        * called Bindings::get_bindings() to setup their list of keybindings.
+        * Do that here for the global bindings.
+        */
+
+       if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
+               error << _("Global keybindings are missing") << endmsg;
+       }
 
        ProcessorBox::register_actions ();