ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Paul Davis 2015-12-07 12:38:11 -05:00
parent 3d79e3c116
commit dafb9ee0e6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/bundle_env_cocoa.cc
View File

@ -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);
}

4
gtk2_ardour/bundle_env_linux.cc
View File

@ -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

4
gtk2_ardour/bundle_env_mingw.cc
View File

@ -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;

4
gtk2_ardour/bundle_env_msvc.cc
View File

@ -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