From 51df70b40541115e514cf95a8e41f42baa8c6afc Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 20 Mar 2019 11:15:47 -0700
Subject: [PATCH] ActionManager::get_all_actions() no longer includes <Actions>
 in the paths it returns, part 3 (GUI)

---
 gtk2_ardour/ardour_ui.cc      | 3 +--
 gtk2_ardour/editor.cc         | 2 +-
 gtk2_ardour/editor_summary.cc | 6 ++++++
 gtk2_ardour/luainstance.cc    | 6 +-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c9a5ac8e1a..5cd23cda09 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -772,8 +772,7 @@ ARDOUR_UI::post_engine ()
 		vector<string>::iterator l;
 
 		for (p = paths.begin(), l = labels.begin(); p != paths.end(); ++p, ++l) {
-			output << "	<tr><th><kbd class=\"osc\">" << (*p).substr (10, string::npos);
-			output << "</kbd></th><td>" << *l << "</td></tr>" << endl;
+			output << "	<tr><th><kbd class=\"osc\">" << *p << "</kbd></th><td>" << *l << "</td></tr>" << endl;
 		}
 		output << "  </tbody>\n  </table>" << endl;
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 63bf7f1e4a..c441139cc0 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5577,7 +5577,7 @@ Editor::timeaxisview_deleted (TimeAxisView *tv)
 			 * button to inactive (which also unticks the menu option)
 			 */
 
-			ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer");
+			ActionManager::uncheck_toggleaction ("Editor/show-editor-mixer");
 		}
 	}
 }
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index ac86e884c2..872abaa17b 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -424,6 +424,9 @@ EditorSummary::on_key_press_event (GdkEventKey* key)
 {
 	gint x, y;
 	GtkAccelKey set_playhead_accel;
+
+	/* XXXX this is really ugly and should be using our own action maps and bindings */
+
 	if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
 		if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
 			if (_session) {
@@ -442,6 +445,9 @@ EditorSummary::on_key_release_event (GdkEventKey* key)
 {
 
 	GtkAccelKey set_playhead_accel;
+
+	/* XXXX this is really ugly and should be using our own action maps and bindings */
+
 	if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
 		if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
 			return true;
diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index 234eb53ae5..a334916539 100644
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -477,17 +477,13 @@ lua_actionlist (lua_State *L)
 		if (parts[1] == _("ProcessorMenu"))
 			continue;
 
-		/* strip <Actions>/ from the start */
-		string path = (*p);
-		path = path.substr (strlen ("<Actions>/"));
-
 		if (!action_tbl[parts[1]].isTable()) {
 			action_tbl[parts[1]] = luabridge::newTable (L);
 		}
 		assert (action_tbl[parts[1]].isTable());
 		luabridge::LuaRef tbl (action_tbl[parts[1]]);
 		assert (tbl.isTable());
-		tbl[*l] = path;
+		tbl[*l] = *p;
 	}
 
 	luabridge::push (L, action_tbl);