diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-18 21:32:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-18 21:32:55 +0000 |
| commit | 70ed264f5a5f2436137ebf30d78ee17a29d13bc1 (patch) | |
| tree | 1eb41d689d2ab3c1884e064ee953ea884556bcfb | |
| parent | 14b0168dbecdc5d6e6e29d2d91510c5bd24d318f (diff) | |
define CHARSETALIASDIR (again) to stop various bits of the GNU stack from loading a charset.alias file that we did not provide
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12770 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/main.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 55ab4e3997..4aba2bbbdc 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -234,7 +234,7 @@ fixup_bundle_environment (int argc, char* argv[]) // gettext charset aliases - setenv ("CHARSETALIASDIR", path.c_str(), 1); + setenv ("CHARSETALIASDIR", dir_path.c_str(), 1); // font config @@ -431,6 +431,11 @@ fixup_bundle_environment (int argc, char* argv[]) mpath = Glib::build_filename (ARDOUR::get_user_ardour_path(), "gdk-pixbuf.loaders"); setenv ("GDK_PIXBUF_MODULE_FILE", mpath.c_str(), 1); } + + /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack + from looking outside the bundle to find the charset.alias file. + */ + setenv ("CHARSETALIASDIR", dir_path.c_str(), 1); } #endif |