From e3c303d72f4fc0ee8ea2ed76dd87b05f50a924f5 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 25 Jul 2015 20:09:23 +1000 Subject: [PATCH] Revert "A few more instances of non-glib 'open()' getting used without locale-specific input paths" This reverts commit 52ef02b387d8267315547129f7f100048a5c1166. --- libs/ardour/globals.cc | 7 +++---- libs/ardour/utils.cc | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index c18d6a9e41..fa6f833d94 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -61,7 +61,6 @@ #undef check /* stupid Apple and their un-namespaced, generic Carbon macros */ #endif -#include #include #include @@ -648,13 +647,13 @@ static const bool translate_by_default = true; string ARDOUR::translation_enable_path () { - return Glib::build_filename (user_config_directory(), ".translate"); + return Glib::build_filename (user_config_directory(), ".translate"); } bool ARDOUR::translations_are_enabled () { - int fd = ::open (Glib::locale_from_utf8 (ARDOUR::translation_enable_path()).c_str(), O_RDONLY); + int fd = ::open (ARDOUR::translation_enable_path().c_str(), O_RDONLY); if (fd < 0) { return translate_by_default; @@ -676,7 +675,7 @@ bool ARDOUR::set_translations_enabled (bool yn) { string i18n_enabler = ARDOUR::translation_enable_path(); - int fd = ::open (Glib::locale_from_utf8 (i18n_enabler).c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0644); + int fd = ::open (i18n_enabler.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0644); if (fd < 0) { return false; diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 71051434c6..270aaa37fd 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -42,7 +42,6 @@ #include #include -#include #include #include @@ -300,7 +299,7 @@ ARDOUR::cmp_nocase_utf8 (const string& s1, const string& s2) int ARDOUR::touch_file (string path) { - int fd = open (Glib::locale_from_utf8 (path).c_str(), O_RDWR|O_CREAT, 0660); + int fd = open (path.c_str(), O_RDWR|O_CREAT, 0660); if (fd >= 0) { close (fd); return 0; -- 2.30.2