projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracks build ... backends are hard-coded
[ardour.git]
/
gtk2_ardour
/
bundle_env_cocoa.cc
diff --git
a/gtk2_ardour/bundle_env_cocoa.cc
b/gtk2_ardour/bundle_env_cocoa.cc
index 316bc8dce3b2a0a3198b6d33eca0c6ffc786be32..fafa1893bd3995ed6ef1a1ee44d2ef21a60f6d4d 100644
(file)
--- a/
gtk2_ardour/bundle_env_cocoa.cc
+++ b/
gtk2_ardour/bundle_env_cocoa.cc
@@
-52,7
+52,7
@@
using namespace std;
extern void set_language_preference (); // cocoacarbon.mm
void
extern void set_language_preference (); // cocoacarbon.mm
void
-fixup_bundle_environment (int, char* [],
const char**
localedir)
+fixup_bundle_environment (int, char* [],
string &
localedir)
{
if (!g_getenv ("ARDOUR_BUNDLED")) {
return;
{
if (!g_getenv ("ARDOUR_BUNDLED")) {
return;
@@
-76,7
+76,7
@@
fixup_bundle_environment (int, char* [], const char** localedir)
#ifdef ENABLE_NLS
if (!ARDOUR::translations_are_enabled ()) {
#ifdef ENABLE_NLS
if (!ARDOUR::translations_are_enabled ()) {
-
(*localedir)
= "/this/cannot/exist";
+
localedir
= "/this/cannot/exist";
} else {
/* force localedir into the bundle */
} else {
/* force localedir into the bundle */
@@
-84,7
+84,7
@@
fixup_bundle_environment (int, char* [], const char** localedir)
lpath.push_back (bundle_dir);
lpath.push_back ("Resources");
lpath.push_back ("locale");
lpath.push_back (bundle_dir);
lpath.push_back ("Resources");
lpath.push_back ("locale");
-
(*localedir) = strdup (Glib::build_filename (lpath).c_str()
);
+
localedir = Glib::build_filename (lpath).c_str(
);
}
#endif
}
#endif