diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-05 15:36:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-05 15:36:28 +0000 |
| commit | 54923a38843d23bfd8a204ebaf84fc60b9d9dbc0 (patch) | |
| tree | fd5ebe52af121eebf210d8eb8165f8db11f5cf2a /gtk2_ardour | |
| parent | 6bd097cc351655ce61e6cfe5490ff7253be044ea (diff) | |
slightly improved (wink) version of fontconfig bundled fix
git-svn-id: svn://localhost/ardour2/branches/3.0@12191 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/main.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 9803ea2f05..70df4c7603 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -364,6 +364,19 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) setenv ("GTK_LOCALEDIR", localedir, 1); } + /* Tell fontconfig where to find fonts.conf. Use the system version + if it exists, otherwise use the stuff we included in t + */ + + if (Glib::file_test ("/etc/fonts/fonts.conf", Glib::FILE_TEST_EXISTS)) { + setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 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); + } + /* 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 ... @@ -395,19 +408,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) setenv ("PANGO_RC_FILE", path.c_str(), 1); - /* Tell fontconfig where to find fonts.conf. Use the system version - if it exists, otherwise use the stuff we included in t - */ - - if (Glib::file_test ("/etc/fonts/fonts.conf", Glib::FILE_TEST_EXISTS)) { - setenv ("/etc/fonts/fonts.conf", path.c_str(), 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); - } - /* similar for GDK pixbuf loaders, but there's no RC file required to specify where it lives. */ |