Strip trailing whitespace in template descriptions

diff --git a/gtk2_ardour/save_template_dialog.cc b/gtk2_ardour/save_template_dialog.cc
index 5d23006926194dad7255ebb71ef0ff7f116c01ff..e4d3f6cbeb150c9ce8afa368085423886a0cac09 100644 (file)
--- a/gtk2_ardour/save_template_dialog.cc
+++ b/gtk2_ardour/save_template_dialog.cc
@@ -68,5 +68,11 @@ SaveTemplateDialog::get_template_name () const
 std::string
 SaveTemplateDialog::get_description () const
 {
-       return _description_editor.get_buffer()->get_text();
+       std::string desc_txt = _description_editor.get_buffer()->get_text ();
+       std::string::reverse_iterator wss = desc_txt.rbegin();
+       while (wss != desc_txt.rend() && isspace (*wss)) {
+               desc_txt.erase (--(wss++).base());
+       }
+
+       return desc_txt;
 }

diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
index 09adc2cb8efcf5351604c71175bed7f0dba04173..696cb29decbb8e45ff3339e06d4eb214a03c71fc 100644 (file)
--- a/gtk2_ardour/template_dialog.cc
+++ b/gtk2_ardour/template_dialog.cc
@@ -420,7 +420,12 @@ TemplateManager::save_template_desc ()
 {
        const string file_path = template_file (_current_selection);
 
-       const string desc_txt = _description_editor.get_buffer()->get_text ();
+       string desc_txt = _description_editor.get_buffer()->get_text ();
+       string::reverse_iterator wss = desc_txt.rbegin();
+       while (wss != desc_txt.rend() && isspace (*wss)) {
+               desc_txt.erase (--(wss++).base());
+       }
+
        _current_selection->set_value (_template_columns.description, desc_txt);
 
        XMLTree tree;