AU: install latency listener

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 67117c2f2f90920330972c637a614f9b27c9bd38..301ed5740dd6ad0fb83e354284840cbbd74e1822 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -55,7 +55,7 @@
 
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -136,6 +136,7 @@ UIConfiguration::parameter_changed (string param)
 void
 UIConfiguration::reset_gtk_theme ()
 {
+       LocaleGuard lg;
        stringstream ss;
 
        ss << "gtk_color_scheme = \"" << hex;
@@ -300,12 +301,14 @@ UIConfiguration::load_color_theme (bool allow_own)
 
                PBD::Searchpath sp (user_config_directory());
 
-               if (find_file (sp, color_file_name (true, running_from_source, true), cfile)) {
+               /* user's own color files never have the program name in them */
+
+               if (find_file (sp, color_file_name (true, false, true), cfile)) {
                        found = true;
                }
 
                if (!found) {
-                       if (find_file (sp, color_file_name (true, running_from_source, false), cfile)) {
+                       if (find_file (sp, color_file_name (true, false, false), cfile)) {
                                found = true;
                        }
                }