projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent Primary-click or Shift-click from deselecting when clicking on a track "backg...
[ardour.git]
/
gtk2_ardour
/
main.cc
diff --git
a/gtk2_ardour/main.cc
b/gtk2_ardour/main.cc
index 407be09068cb707556ddddcd80c731e5a973d1d7..cebef59f26c5995f7f18ccc2b945b819f68c0045 100644
(file)
--- a/
gtk2_ardour/main.cc
+++ b/
gtk2_ardour/main.cc
@@
-144,7
+144,7
@@
fixup_bundle_environment (int, char* [])
std::string path;
std::string exec_dir = Glib::path_get_dirname (execpath);
std::string bundle_dir;
std::string path;
std::string exec_dir = Glib::path_get_dirname (execpath);
std::string bundle_dir;
- std::string userconfigdir = user_config_directory()
.to_string()
;
+ std::string userconfigdir = user_config_directory();
bundle_dir = Glib::path_get_dirname (exec_dir);
bundle_dir = Glib::path_get_dirname (exec_dir);
@@
-222,7
+222,7
@@
fixup_bundle_environment (int /*argc*/, char* argv[])
std::string path;
std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
std::string path;
std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
- std::string userconfigdir = user_config_directory()
.to_string()
;
+ std::string userconfigdir = user_config_directory();
/* note that this function is POSIX/Linux specific, so using / as
a dir separator in this context is just fine.
/* note that this function is POSIX/Linux specific, so using / as
a dir separator in this context is just fine.
@@
-428,7
+428,7
@@
int main (int argc, char *argv[])
if (no_splash) {
cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
if (no_splash) {
cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
- << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
+ << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker
, Robin Gareus
") << endl
<< endl
<< string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
<< _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
<< endl
<< string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
<< _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl