Remove use of invalidated iterator (#4826).

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 6d29737b8643bb633773529d92a999e4b9322610..e9252bcbffc0e567614cdaff72cc5a606cb1a926 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -51,7 +51,6 @@ vector<RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::write_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::plugin_selection_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::region_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::track_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::point_selection_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::time_selection_sensitive_actions;
@@ -69,10 +68,10 @@ vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actio
 void
 ActionManager::init ()
 {
-       ui_manager = UIManager::create ();
-
        sys::path ui_file;
 
+       ui_manager = UIManager::create ();
+
        SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
 
        find_file_in_search_path (spath, "ardour.menus", ui_file);
@@ -92,7 +91,7 @@ ActionManager::init ()
 
        if (!loaded) {
                cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl;
-                error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
+               error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
                exit(1);
        }
 }
@@ -186,16 +185,3 @@ ActionManager::map_some_state (const char* group, const char* action, sigc::slot
        }
 }
 
-string
-ActionManager::get_key_representation (const string& accel_path, AccelKey& key)
-{
-       bool known = lookup_entry (accel_path, key);
-       
-       if (known) {
-               uint32_t k = possibly_translate_legal_accelerator_to_real_key (key.get_key());
-               key = AccelKey (k, Gdk::ModifierType (key.get_mod()));
-               return ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod()));
-       } 
-       
-       return unbound_string;
-}