use correctly named action to put preferences into the global menu bar on OS X

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 30e9bf267b5447df60cfc3e5c4bdc5146d7c70b7..4bfc87c187ef04c3e8c892d5aacd4c54629a9f94 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -296,8 +296,8 @@
       </menu>
 #ifndef GTKOSX
       <separator/>
-      <menuitem action='menu-show-preferences'/>
 #endif
+      <menuitem action='menu-show-preferences'/>
     </menu>         
 
     <menu name='RegionMenu' action='RegionMenu'>

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 3382a3f3d86def843ad982663e6c5c24bf6a430e..9accf7895324690c4fdb9de9216631c0660f0087 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -663,7 +663,7 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
                app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
         }
 
-       if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-rc-options-editor"))) {
+       if ((widget = ActionManager::get_widget ("/ui/Main/Edit/menu-show-preferences"))) {
                app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
         }