enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / color_theme_manager.cc

diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc
index 10eb9402e27bdf7834e14b697aa5fc39c9d99c2f..e038493c96ce57216317a8625d237293fd1dcd95 100644 (file)
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -46,7 +46,7 @@
 #include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -231,7 +231,9 @@ ColorThemeManager::reset_canvas_colors()
        string cfile;
        string basename;
 
-       basename = UIConfiguration::instance().color_file_name (false, running_from_source_tree(), false);
+       /* look for a versioned user-owned color file, and try to rename it */
+
+       basename = UIConfiguration::instance().color_file_name (true, false, true);
 
        if (find_file (ardour_config_search_path(), basename, cfile)) {
                string backup = cfile + string (X_(".old"));