[Summary] Following review Paul did after 9b0fc7b743219b8daecbef91c9772937fd874822...

[ardour.git] / gtk2_ardour / bundle_env_linux.cc

diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index ad484aa7c7df1e92ce8c658fa117935b442eabea..54404b14fb7fa83ae5376432edb54965926ee54e 100644 (file)
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -60,7 +60,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir)
 
        std::string path;
        std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
-       std::string userconfigdir = user_config_directory();
 
 #ifdef ENABLE_NLS
        if (!ARDOUR::translations_are_enabled ()) {
@@ -106,39 +105,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir)
                error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
        }
 
-       /* write a pango.rc file and tell pango to use it. we'd love
-          to put this into the Ardour.app bundle and leave it there,
-          but the user may not have write permission. so ...
-
-          we also have to make sure that the user ardour directory
-          actually exists ...
-       */
-
-       if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-               error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
-                     << endmsg;
-       } else {
-               
-               path = Glib::build_filename (userconfigdir, "pango.rc");
-               std::ofstream pangorc (path.c_str());
-               if (!pangorc) {
-                       error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-               } else {
-                       pangorc << "[Pango]\nModuleFiles="
-                               << Glib::build_filename (userconfigdir, "pango.modules")
-                               << endl;
-                       pangorc.close ();
-               }
-               
-               g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
-               
-               /* similar for GDK pixbuf loaders, but there's no RC file required
-                  to specify where it lives.
-               */
-               
-               g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").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.
         */