reverse logic in plugin GUI key handling

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e981df7d81cde7404163ae998563d89399e85b13..2e6c9daf82a8c9976bec50e2d85dea693cdb5251 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -214,11 +214,11 @@ static void console_madness_end () {}
 static void command_line_parse_error (int *argc, char** argv[]) {
        // Since we don't ordinarily have access to stdout and stderr with
        // an MSVC app, let the user know we encountered a parsing error.
-       Gtk::Main app(&argc, &argv); // Calls 'gtk_init()'
+       Gtk::Main app(argc, argv); // Calls 'gtk_init()'
 
-       Gtk::MessageDialog dlgReportParseError (_("\n   Ardour could not understand your command line      "),
+       Gtk::MessageDialog dlgReportParseError (string_compose (_("\n   %1 could not understand your command line      "), PROGRAM_NAME),
                        false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
-       dlgReportParseError.set_title (_("An error was encountered while launching Ardour"));
+       dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME));
        dlgReportParseError.run ();
 }
 
@@ -228,23 +228,6 @@ static void console_madness_end () {}
 static void command_line_parse_error (int *argc, char** argv[]) {}
 #endif
 
-static bool
-ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version)
-{
-       MessageDialog msg (string_compose (_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n"
-                                            "Would you like to copy them before starting to use the program?\n\n"
-                                            "\n"
-                                            "(Note that not all files will be copied, since some are no longer relevant)"),
-                                          PROGRAM_NAME, PROGRAM_VERSION, version), true);
-
-       msg.add_button (Gtk::Stock::NO, Gtk::RESPONSE_NO);
-       msg.add_button (Gtk::Stock::YES, Gtk::RESPONSE_YES);
-       msg.show_all ();
-
-       return (msg.run() == Gtk::RESPONSE_YES);
-}
-
-
 #if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
 /*
  *  Release build with MSVC uses ardour_main()
@@ -268,6 +251,8 @@ int ardour_main (int argc, char *argv[])
 int main (int argc, char *argv[])
 #endif
 {
+       ARDOUR::check_for_old_configuration_files();
+
        fixup_bundle_environment (argc, argv, &localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */