forward port 7015 from 2.x

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 807aee93bdcabafaba687f23e184bbabc4c266cf..82c544c50cb90d0c554fe2efea4315572e302c04 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -211,7 +211,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
        using namespace Notebook_Helpers;
 
        set_default_size (300, 300);
-       set_wmclass (X_("ardour_preferences"), "Ardour");
+       set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
 
        set_name ("Preferences");
        add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
@@ -267,8 +267,6 @@ OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o)
                _pages[pn] = new OptionEditorPage (_notebook, pn);
        }
 
-       cout << "add thing to " << pn << "\n";
-
        OptionEditorPage* p = _pages[pn];
        p->components.push_back (o);