From 8a135425c9c74f1d886724ff3281c04b97b97412 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 13 Jul 2014 02:10:39 +0000 Subject: Only use old 2-argument version of Glib::build_filename (fix #971). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5408 a436a847-0d15-0410-975c-d299462d15a1 --- src/Configuration.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Configuration.cpp') diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 536be9d8..51aff65f 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -233,7 +233,8 @@ Configuration::save(URIMap& uri_map, // Save to file if it is absolute, otherwise save to user config dir std::string path = filename; if (!Glib::path_is_absolute(path)) { - path = Glib::build_filename(Glib::get_user_config_dir(), app, filename); + path = Glib::build_filename( + Glib::build_filename(Glib::get_user_config_dir(), app), filename); } // Create parent directories if necessary @@ -312,14 +313,15 @@ Configuration::load_default(const std::string& app, const std::vector dirs = Glib::get_system_config_dirs(); for (auto d : dirs) { - const std::string path = Glib::build_filename(d, app, filename); + const std::string path = Glib::build_filename( + Glib::build_filename(d, app), filename); if (load(path)) { loaded.push_back(path); } } const std::string path = Glib::build_filename( - Glib::get_user_config_dir(), app, filename); + Glib::build_filename(Glib::get_user_config_dir(), app), filename); if (load(path)) { loaded.push_back(path); } -- cgit v1.2.1