define CHARSETALIASDIR (again) to stop various bits of the GNU stack from loading...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12770 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 55ab4e39975ab61a061f39fd69b2a54d44fc7327..4aba2bbbdc2488a2099dbdb19399fa62ec17a67d 100644 (file)
--- 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