X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fsurfaces%2Ffaderport%2Fgui.cc;h=5b0921e9ac051f351ac57647b4e4cd9b4b3695bb;hb=HEAD;hp=68c89007b14534e26c6e1dde6814cc777c23134a;hpb=0f6e67a32fed814003b69df0e35cd8caa770efba;p=ardour.git

diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index 68c89007b1..5b0921e9ac 100644
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -25,6 +25,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
+#include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
@@ -359,7 +360,7 @@ FPGUI::build_available_action_menu ()
 	vector<string> keys;
 	vector<Glib::RefPtr<Gtk::Action> > actions;
 
-	Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+	ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
 	typedef std::map<string,TreeIter> NodeMap;
 	NodeMap nodes;
@@ -519,7 +520,7 @@ FPGUI::build_mix_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
 {
 	vector<pair<string,string> > actions;
 
-	actions.push_back (make_pair (string (_("Show Mixer Window")), string (X_("Window/show-mixer"))));
+	actions.push_back (make_pair (string (_("Show Mixer Window")), string (X_("Common/show-mixer"))));
 	actions.push_back (make_pair (string (_("Show/Hide Mixer list")), string (X_("Common/ToggleMixerList"))));
 	actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge"))));
 	actions.push_back (make_pair (string (_("Show/Hide Editor mixer strip")), string (X_("Editor/show-editor-mixer"))));