diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2015-07-25 20:09:23 +1000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2015-07-25 23:14:50 +1000 |
commit | e3c303d72f4fc0ee8ea2ed76dd87b05f50a924f5 (patch) | |
tree | 77ded2a025c2683aab80d66cbb806914a113ecf7 /libs/ardour/globals.cc | |
parent | b2ff1e1734897cb9ee334ba82bd382c8e44b80f9 (diff) |
Revert "A few more instances of non-glib 'open()' getting used without locale-specific input paths"
This reverts commit 52ef02b387d8267315547129f7f100048a5c1166.
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r-- | libs/ardour/globals.cc | 7 |
1 files changed, 3 insertions, 4 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 <glibmm/convert.h> #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> @@ -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; |