From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 7 Dec 2015 17:38:11 +0000 (-0500)
Subject: the variable used to define GTK2 RC files is GTK2_RC_FILES not GTK_RC_FILES (it was... 
X-Git-Tag: 4.5~271
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=dafb9ee0e68ec137213cf915ec3282b2b51db72a;p=ardour.git

the variable used to define GTK2 RC files is GTK2_RC_FILES not GTK_RC_FILES (it was changed in GTK+ back in 2002
---

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index cd939ea0aa..df951b8801 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -105,10 +105,10 @@ fixup_bundle_environment (int, char* [], string & localedir)
 	g_setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
 	g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(g_getenv ("PATH"))).c_str(), 1);
 
-	/* unset GTK_RC_FILES so that we only load the RC files that we define
+	/* unset GTK2_RC_FILES so that we only load the RC files that we define
 	 */
 
-	g_unsetenv ("GTK_RC_FILES");
+	g_unsetenv ("GTK2_RC_FILES");
 	g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
 	g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
 }
diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index 259421b354..cc02445302 100644
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -88,10 +88,10 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
 	g_setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
 	g_setenv ("PATH", (dir_path + "/bin:" + std::string(g_getenv ("PATH"))).c_str(), 1);
 
-	/* unset GTK_RC_FILES so that we only load the RC files that we define
+	/* unset GTK2_RC_FILES so that we only load the RC files that we define
 	 */
 
-	g_unsetenv ("GTK_RC_FILES");
+	g_unsetenv ("GTK2_RC_FILES");
 
 	/* Tell fontconfig where to find fonts.conf. Use the system version
 	   if it exists, otherwise use the stuff we included in the bundle
diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc
index 7c543143ff..c2547bed44 100644
--- a/gtk2_ardour/bundle_env_mingw.cc
+++ b/gtk2_ardour/bundle_env_mingw.cc
@@ -50,8 +50,8 @@ fixup_bundle_environment (int, char* [], string & localedir)
 	// setting a FONTCONFIG_FILE won't hurt either see bundle_env_msvc.cc
 	// (pangocairo prefers the windows gdi backend unless PANGOCAIRO_BACKEND=fc is set)
 
-	// Unset GTK_RC_FILES so that only ardour specific files are loaded
-	Glib::unsetenv ("GTK_RC_FILES");
+	// Unset GTK2_RC_FILES so that only ardour specific files are loaded
+	Glib::unsetenv ("GTK2_RC_FILES");
 
 	std::string path;
 
diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index 1987b03819..864f9d8288 100644
--- a/gtk2_ardour/bundle_env_msvc.cc
+++ b/gtk2_ardour/bundle_env_msvc.cc
@@ -467,8 +467,8 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir)
 	Glib::setenv ("GTK_PATH", path, true);
 
 
-	// Unset GTK_RC_FILES so that we only load the RC files that we define
-	Glib::unsetenv ("GTK_RC_FILES");
+	// Unset GTK2_RC_FILES so that we only load the RC files that we define
+	Glib::unsetenv ("GTK2_RC_FILES");
 
 
 	// and set a '$HOME' environment variable. This variable changes the value returned