From d7d164cd74e2d393fc7a5691cb301d1d8bb40d0e Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 4 Dec 2007 03:28:35 +0000
Subject: [PATCH] minor changes from OS X land

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2736 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour-sae.bindings.in | 4 ++--
 gtk2_ardour/editor_actions.cc      | 2 +-
 gtk2_ardour/keyeditor.cc           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/ardour-sae.bindings.in b/gtk2_ardour/ardour-sae.bindings.in
index 0662f85a92..2449abd00e 100644
--- a/gtk2_ardour/ardour-sae.bindings.in
+++ b/gtk2_ardour/ardour-sae.bindings.in
@@ -153,7 +153,7 @@
 ; (gtk_accel_path "<Actions>/Main/Help" "")
 ; (gtk_accel_path "<Actions>/options/UseExternalMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte23976" "")
-(gtk_accel_path "<Actions>/Common/goto-editor" "<%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Common/goto-editor" "<%WINDOW%>e")
 (gtk_accel_path "<Actions>/Editor/select-all" "F14")
 (gtk_accel_path "<Actions>/Editor/invert-selection" "F15")
 (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
@@ -228,7 +228,7 @@
 ; (gtk_accel_path "<Actions>/Editor/SnapMode" "")
 (gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%WINDOW%>o")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
-(gtk_accel_path "<Actions>/Common/goto-mixer" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Common/goto-mixer" "<%WINDOW%>m")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileCreationDate" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/activate" "")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index eb6c29b242..487d354a0a 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -208,7 +208,7 @@ Editor::register_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "zoom-to-session", _("Zoom to Session"), mem_fun(*this, &Editor::temporal_zoom_session));
 	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (editor_actions, "zoom-to-region", _("Zoom to Session"), mem_fun(*this, &Editor::temporal_zoom_region));
+	act = ActionManager::register_action (editor_actions, "zoom-to-region", _("Zoom to Region"), mem_fun(*this, &Editor::temporal_zoom_region));
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-zoom", _("Toggle Zoom State"), mem_fun(*this, &Editor::swap_visual_state));
 	ActionManager::session_sensitive_actions.push_back (act);
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 053ed782a2..4f378d2dbc 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -185,7 +185,7 @@ KeyEditor::populate ()
 
 #ifdef GTKOSX
 			string label = (*k);
-			replace_all (label, "<Control>", _("Command-"));
+			replace_all (label, "<Mod5>", _("Command-"));
 			replace_all (label, "<Alt>", _("Option-"));
 			replace_all (label, "<Shift>", _("Shift-"));
 			row[columns.binding] = label;