Merge branch 'chaot4-fix_crop_region_to_range_2'

[ardour.git] / gtk2_ardour / bundle_env_cocoa.cc

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index 1f55b10954e11478ceb522a28a4459e832bced17..cd939ea0aa82b385f1cf0a326dddbc1bb146fb32 100644 (file)
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <fstream>
 #include <string>
 #include <vector>
 #include <cerrno>
@@ -76,18 +75,18 @@ fixup_bundle_environment (int, char* [], string & localedir)
 
 #ifdef ENABLE_NLS
        if (!ARDOUR::translations_are_enabled ()) {
-               (*localedir) = "/this/cannot/exist";
+               localedir = "/this/cannot/exist";
        } else {
                /* force localedir into the bundle */
-               
+
                vector<string> lpath;
                lpath.push_back (bundle_dir);
                lpath.push_back ("Resources");
                lpath.push_back ("locale");
-               localedir = strdup (Glib::build_filename (lpath).c_str());
+               localedir = Glib::build_filename (lpath).c_str();
        }
 #endif
-               
+
        export_search_path (bundle_dir, "ARDOUR_DLL_PATH", "/lib");
 
        /* inside an OS X .app bundle, there is no difference
@@ -114,7 +113,7 @@ fixup_bundle_environment (int, char* [], string & localedir)
        g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
 }
 
-void load_custom_fonts() 
+void load_custom_fonts()
 {
        /* this code will only compile on OS X 10.6 and above, and we currently do not
         * need it for earlier versions since we fall back on a non-monospace,