projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d79e3c
)
the variable used to define GTK2 RC files is GTK2_RC_FILES not GTK_RC_FILES (it was...
author
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 7 Dec 2015 17:38:11 +0000
(12:38 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 7 Dec 2015 17:38:17 +0000
(12:38 -0500)
gtk2_ardour/bundle_env_cocoa.cc
patch
|
blob
|
history
gtk2_ardour/bundle_env_linux.cc
patch
|
blob
|
history
gtk2_ardour/bundle_env_mingw.cc
patch
|
blob
|
history
gtk2_ardour/bundle_env_msvc.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/bundle_env_cocoa.cc
b/gtk2_ardour/bundle_env_cocoa.cc
index cd939ea0aa82b385f1cf0a326dddbc1bb146fb32..df951b8801bb2eb43f6f150e5240225c84a70636 100644
(file)
--- 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);
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 GTK
2
_RC_FILES so that we only load the RC files that we define
*/
*/
- g_unsetenv ("GTK_RC_FILES");
+ g_unsetenv ("GTK
2
_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);
}
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 259421b354891001b125ecfd5d27380baf85c5e6..cc024453027f7cec5f3fea741b0530e555c7a6f1 100644
(file)
--- 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);
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 GTK
2
_RC_FILES so that we only load the RC files that we define
*/
*/
- g_unsetenv ("GTK_RC_FILES");
+ g_unsetenv ("GTK
2
_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
/* 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 7c543143ff6d39f91297a44ca6bafab6bc5b8dbc..c2547bed444122592883406e1dc5b5248ab9b36d 100644
(file)
--- 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)
// 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 GTK
2
_RC_FILES so that only ardour specific files are loaded
+ Glib::unsetenv ("GTK
2
_RC_FILES");
std::string path;
std::string path;
diff --git
a/gtk2_ardour/bundle_env_msvc.cc
b/gtk2_ardour/bundle_env_msvc.cc
index 1987b03819e0368ce7acdd63d6524241b4086527..864f9d82882cc6d1c77bfbd966598e5d073b14ac 100644
(file)
--- 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);
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 GTK
2
_RC_FILES so that we only load the RC files that we define
+ Glib::unsetenv ("GTK
2
_RC_FILES");
// and set a '$HOME' environment variable. This variable changes the value returned
// and set a '$HOME' environment variable. This variable changes the value returned