r228@gwythaint (orig r768): fugalh | 2006-08-09 08:14:55 -0600

[ardour.git] / gtk2_ardour / actions.cc

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 1ca9278bafa9ea0382dc7682efb290369d8fce94..2197d4dc005174b19d41d78727c2ca0699bfacd5 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -19,7 +19,7 @@
 */
 
 #include <vector>
-#include <string.h>
+#include <string>
 
 #include <gtk/gtkaccelmap.h>
 #include <gtk/gtkuimanager.h>
@@ -39,6 +39,7 @@ using namespace std;
 using namespace Gtk;
 using namespace Glib;
 using namespace sigc;
+using namespace PBD;
 
 vector<RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions;
@@ -64,12 +65,8 @@ ActionManager::init ()
 {
        ui_manager = UIManager::create ();
        
-       std::string ui_file = Glib::getenv(X_("ARDOUR_UI"));
-    
-        if(!Glib::file_test(ui_file, Glib::FILE_TEST_EXISTS)) ui_file = ARDOUR::find_config_file("ardour.menus");
+       std::string ui_file = ARDOUR::find_config_file("ardour.menus");
 
-       std::cout << "Loading UI definition file " << ui_file << std::endl;
-       
        bool loaded = false;
        
        try {
@@ -139,7 +136,6 @@ ActionManager::register_radio_action (RefPtr<ActionGroup> group, RadioAction::Gr
        return act;
 }
 
-
 RefPtr<Action>
 ActionManager::register_toggle_action (RefPtr<ActionGroup> group, const char * name, const char * label, slot<void> sl, guint key, Gdk::ModifierType mods)
 {