use lower-case PROGRAM_NAME for user bindings file name
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 10 Jul 2014 15:01:21 +0000 (11:01 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 10 Jul 2014 15:01:21 +0000 (11:01 -0400)
gtk2_ardour/keyboard.cc

index d4bf2377805178560cd18d3e0adeda74ec9cae44..ca65a2b3f2ee5f10a2b45770609327a54fd4e0c9 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include "pbd/convert.h"
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 
@@ -60,7 +61,9 @@ ArdourKeyboard::setup_keybindings ()
 
        /* set up the per-user bindings path */
 
-       user_keybindings_path = Glib::build_filename (user_config_directory(), "ardour.bindings");
+       string lowercase_program_name = downcase (PROGRAM_NAME);
+
+       user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + ".bindings");
 
        if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) {
                std::pair<string,string> newpair;
@@ -154,9 +157,6 @@ ArdourKeyboard::setup_keybindings ()
                                        error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
                                        return;
                                } else {
-                                       warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
-                                                                  keybindings_path)
-                                               << endmsg;
                                        keybindings_path = default_bindings;
                                }