fix gtk errors caused by using non-escaped paths in a column used as a tooltip (which...

git-svn-id: svn://localhost/ardour2/branches/3.0@13944 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index b46a4169b133c014b9b2ab5be49150a5abd8f545..91e48c15bc73bceeffb566571c164b017d8cfa24 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -974,19 +974,19 @@ ArdourStartup::redisplay_recent_sessions ()
                        // add the children
 
                        for (std::vector<std::string>::iterator i2 = state_file_names.begin();
-                                       i2 != state_file_names.end(); ++i2)
-                       {
+                                       i2 != state_file_names.end(); ++i2) {
 
                                Gtk::TreeModel::Row child_row = *(recent_session_model->append (row.children()));
 
                                child_row[recent_session_columns.visible_name] = *i2;
                                child_row[recent_session_columns.fullpath] = fullpath;
+                               child_row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
                                ++session_snapshot_count;
                        }
                }
        }
 
-       recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath 
+       recent_session_display.set_tooltip_column(1); // recent_session_columns.tip 
        recent_session_display.set_model (recent_session_model);
        return session_snapshot_count;
        // return rs.size();

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 60da52fd6f3b1e1ccf31986fbc269d6d1460c406..cf14103b52ee7056836d5989da461a378feaf188 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -156,9 +156,11 @@ class ArdourStartup : public Gtk::Assistant {
        struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
            RecentSessionModelColumns() {
                    add (visible_name);
+                   add (tip);
                    add (fullpath);
            }
            Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> tip;
            Gtk::TreeModelColumn<std::string> fullpath;
        };