X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_cocoa.cc;h=fafa1893bd3995ed6ef1a1ee44d2ef21a60f6d4d;hb=4a10dbbc1b1fc0de33a125dcc1f6d74c592ff3f7;hp=3b3094e7f3e2eb895daf0e6773dfc3f77251621e;hpb=3b5cc5a9fdd6b741f2cda857875fd953a4e87b31;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index 3b3094e7f3..fafa1893bd 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -52,7 +52,7 @@ using namespace std;
 extern void set_language_preference (); // cocoacarbon.mm
 
 void
-fixup_bundle_environment (int, char* [], const char** localedir)
+fixup_bundle_environment (int, char* [], string & localedir)
 {
 	if (!g_getenv ("ARDOUR_BUNDLED")) {
 		return;
@@ -76,7 +76,7 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 
 #ifdef ENABLE_NLS
 	if (!ARDOUR::translations_are_enabled ()) {
-		(*localedir) = "/this/cannot/exist";
+		localedir = "/this/cannot/exist";
 	} else {
 		/* force localedir into the bundle */
 		
@@ -84,7 +84,7 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 		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
 		
@@ -110,37 +110,8 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 	 */
 
 	g_unsetenv ("GTK_RC_FILES");
-
-	/* write a pango.rc file and tell pango to use it. we'd love
-	   to put this into the PROGRAM_NAME.app bundle and leave it there,
-	   but the user may not have write permission. so ...
-
-	   we also have to make sure that the user ardour directory
-	   actually exists ...
-	*/
-
-	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-		error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
-		      << endmsg;
-	} else {
-		
-		path = Glib::build_filename (userconfigdir, "pango.rc");
-		std::ofstream pangorc (path.c_str());
-		if (!pangorc) {
-			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-		} else {
-			pangorc << "[Pango]\nModuleFiles="
-				<< Glib::build_filename (bundle_dir, "Resources/pango.modules") 
-				<< endl;
-			pangorc.close ();
-			
-			g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
-		}
-	}
-	
 	g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
 	g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
-	g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
 }
 
 void load_custom_fonts() 
@@ -153,7 +124,7 @@ void load_custom_fonts()
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 	std::string ardour_mono_file;
 
-	if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+	if (!find_file (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
 		cerr << _("Cannot find ArdourMono TrueType font") << endl;
 	}