don't bother trying to set FONTCONFIG_FILE on linux if /etc/fonts stuff doesn't exist...
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 30 Jan 2013 12:55:59 +0000 (12:55 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 30 Jan 2013 12:55:59 +0000 (12:55 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@14035 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/main.cc

index a0639b1f5ad82711414d920892772114891d11a2..381f97d82f9e0ad133efb18c5c814648ed616b89 100644 (file)
@@ -276,11 +276,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
                setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
                setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
        } else {
-               /* use the one included in the bundle */
-               
-               path = Glib::build_filename (dir_path, "etc/fonts/fonts.conf");
-               setenv ("FONTCONFIG_FILE", path.c_str(), 1);
-               export_search_path (dir_path, "FONTCONFIG_PATH", "/etc/fonts");
+               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