Revert "A few more instances of non-glib 'open()' getting used without locale-specifi...

This reverts commit 52ef02b387d8267315547129f7f100048a5c1166.

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index c18d6a9e418f9512726a4c55c55a2d9b8c00ed10..fa6f833d94eb29fe64980321e4f4a7228efdf9db 100644 (file)
--- 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;

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 71051434c6e6d15a0af67ce11bc07b7e2df74ca9..270aaa37fd5f0c85c00b3d67200c168860fa4cce 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -42,7 +42,6 @@
 #include <errno.h>
 #include <regex.h>
 
-#include <glibmm/convert.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
@@ -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;