From e3872dd19f26609ccdc340401efa44e896f46c31 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 3 Sep 2014 13:08:03 -0400
Subject: [PATCH] clean up use of open_file_dialog() modified API

---
 gtk2_ardour/session_dialog.logic.cc | 64 ++++++-----------------------
 1 file changed, 13 insertions(+), 51 deletions(-)

diff --git a/gtk2_ardour/session_dialog.logic.cc b/gtk2_ardour/session_dialog.logic.cc
index 239437bef3..23aa8783e2 100644
--- a/gtk2_ardour/session_dialog.logic.cc
+++ b/gtk2_ardour/session_dialog.logic.cc
@@ -296,59 +296,21 @@ SessionDialog::on_open_selected (WavesButton*)
 void
 SessionDialog::on_open_saved_session (WavesButton*)
 {
-#ifdef __APPLE__
 	set_keep_above(false);
-    string temp_session_full_file_name = ARDOUR::open_file_dialog(Config->get_default_session_parent_dir(), _("Select Saved Session"));
-    set_keep_above(true);
-    
-    if(!temp_session_full_file_name.empty()) {
-        _selected_session_full_name = temp_session_full_file_name;
-        for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
-            _recent_session_button[i]->set_active (false);
-		}
-		_selection_type = SavedSession;
-		hide();
-		response (Gtk::RESPONSE_ACCEPT);
-    }
-    
+        string temp_session_full_file_name = ARDOUR::open_file_dialog(Config->get_default_session_parent_dir(), _("Select Saved Session"));
+        set_keep_above(true);
+        
+        if(!temp_session_full_file_name.empty()) {
+                _selected_session_full_name = temp_session_full_file_name;
+                for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
+                        _recent_session_button[i]->set_active (false);
+                }
+                _selection_type = SavedSession;
+                hide ();
+                response (Gtk::RESPONSE_ACCEPT);
+        } 
+        
 	return;
-#endif
-  
-#ifdef _WIN32 
-	set_keep_above(false);
-	// Open the file save dialog, and choose the file name
-	string fileName;
-	if (open_file_dialog(fileName, Config->get_default_session_parent_dir(), _("Select Saved Session"))) {
-		set_keep_above(true);
-		_selected_session_full_name = fileName;
-		for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
-            _recent_session_button[i]->set_active(false);
-		}
-        _selection_type = SavedSession;
-		hide();
-		response (Gtk::RESPONSE_ACCEPT);
-	}
-
-	return;
-#endif // _WIN32
-  
-	Gtk::FileChooserDialog dialog(*this, _("Select Saved Session"));
-	dialog.add_button("CANCEL", Gtk::RESPONSE_CANCEL);
-	dialog.add_button("OK", Gtk::RESPONSE_OK);
-
-	set_keep_above(false);
-	int responce = dialog.run ();
-	set_keep_above(true);
-
-    if (responce == Gtk::RESPONSE_OK) {
-		_selected_session_full_name = dialog.get_filename();
-		for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
-            _recent_session_button[i]->set_active(false);
-		}
-        _selection_type = SavedSession;
-		hide();
-		response (Gtk::RESPONSE_ACCEPT);
-	}
 }
 
 void