X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_dialog.cc;h=80ef55322d3995cf917428c247387b034f3076fc;hb=aee658ef96eb77a8fac1cc70bc06e935de7c0fac;hp=7b1b212b8108a591a01691f0e75e2f3bdd21481f;hpb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;p=ardour.git

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 7b1b212b81..80ef55322d 100644
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -57,13 +57,6 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
 
-static string poor_mans_glob (string path)
-{
-	string copy = path;
-	replace_all (copy, "~", Glib::get_home_dir());
-	return copy;
-}
-
 SessionDialog::SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit)
 	: ArdourDialog (_("Session Setup"), true, true)
 	, new_only (require_new)
@@ -76,7 +69,6 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
 	, _master_bus_channel_count_adj (2, 0, 100, 1, 10, 0)
 	, _existing_session_chooser_used (false)
 {
-	set_keep_above (true);
 	set_position (WIN_POS_CENTER);
 	get_vbox()->set_spacing (6);
 
@@ -114,7 +106,7 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
 	
 	get_vbox()->show_all ();
 
-	/* fill data models and how/hide accordingly */
+	/* fill data models and show/hide accordingly */
 
 	populate_session_templates ();
 
@@ -253,7 +245,7 @@ SessionDialog::session_folder ()
 		std::string val = new_name_entry.get_text();
 		strip_whitespace_edges (val);
 		std::string legal_session_folder_name = legalize_for_path (val);
-		return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name);
+		return Glib::build_filename (new_folder_chooser.get_filename (), legal_session_folder_name);
 	}
 }
 
@@ -344,7 +336,7 @@ SessionDialog::setup_initial_choice_box ()
 	recent_session_display.signal_row_activated().connect (sigc::mem_fun (*this, &SessionDialog::recent_row_activated));
 	
 	centering_vbox->pack_start (recent_label, false, false, 12);
-	centering_vbox->pack_start (recent_scroller, false, true);
+	centering_vbox->pack_start (recent_scroller, true, true);
 
 	/* Browse button */
 	
@@ -353,7 +345,7 @@ SessionDialog::setup_initial_choice_box ()
 	existing_session_chooser.set_current_folder(poor_mans_glob (Config->get_default_session_parent_dir()));
 	
 	FileFilter session_filter;
-	session_filter.add_pattern ("*.ardour");
+	session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
 	session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
 	existing_session_chooser.add_filter (session_filter);
 	existing_session_chooser.set_filter (session_filter);