summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-03-15 13:23:18 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-03-15 13:23:18 +0000
commit200cde347298915e6acfdef94c99ae0b1a3ef377 (patch)
treea559f49e92868aa9b29a368f216d632375131b15 /gtk2_ardour
parent11af3f8fdf1daff7a2eda1ce4b2c4926229e4bc0 (diff)
make sure user ardour dir exists before trying to put pango.rc in it
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3147 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/main.cc33
1 files changed, 21 insertions, 12 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 7f856adab6..32789d455d 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -165,22 +165,31 @@ fixup_bundle_environment ()
/* 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 ...
- */
+ but the user may not have write permission. so ...
- path = Glib::build_filename (ARDOUR::get_user_ardour_path(), "pango.rc");
+ we also have to make sure that the user ardour directory
+ actually exists ...
+ */
- std::ofstream pangorc (path.c_str());
- if (!pangorc) {
- error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+ if (g_mkdir_with_parents (ARDOUR::get_user_ardour_path().c_str(), 0755) < 0) {
+ error << string_compose (_("cannot create user ardour folder %1 (%2)"), ARDOUR::get_user_ardour_path(), strerror (errno))
+ << endmsg;
} else {
- pangorc << "[Pango]\nModuleFiles=";
- Glib::ustring mpath = dir_path;
- mpath += "/../Resources/pango.modules";
- pangorc << mpath << endl;
+
+ path = Glib::build_filename (ARDOUR::get_user_ardour_path(), "pango.rc");
- pangorc.close ();
- setenv ("PANGO_RC_FILE", path.c_str(), 1);
+ std::ofstream pangorc (path.c_str());
+ if (!pangorc) {
+ error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+ } else {
+ pangorc << "[Pango]\nModuleFiles=";
+ Glib::ustring mpath = dir_path;
+ mpath += "/../Resources/pango.modules";
+ pangorc << mpath << endl;
+
+ pangorc.close ();
+ setenv ("PANGO_RC_FILE", path.c_str(), 1);
+ }
}
// gettext charset aliases