add theme files to default target, and install using target names

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 04f2f030738063036a58a686c3980ca1d2301fd2..489728286ce3ff9fb2c53cc20bed081470835072 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -43,7 +43,7 @@
 #include "audio_clock.h"
 #include "actions.h"
 #include "utils.h"
-#include "color_manager.h"
+#include "theme_manager.h"
 
 #include "i18n.h"
 
@@ -76,7 +76,7 @@ ARDOUR_UI::setup_windows ()
        setup_transport();
        build_menu_bar ();
 
-       color_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleColorManager")));
+       theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
 
        top_packer.pack_start (menu_bar_base, false, false);
        top_packer.pack_start (transport_frame, false, false);
@@ -835,7 +835,10 @@ void
 ARDOUR_UI::sync_option_changed ()
 {
        if (session) {
-               session->request_slave_source (string_to_slave_source (sync_option_combo.get_active_text()));
+               ustring txt = sync_option_combo.get_active_text ();
+               if (txt.length()) {
+                       session->request_slave_source (string_to_slave_source (txt));
+               }
        }
 }