From 7005529886bcec9300866abc2fc84f336a718a30 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 5 May 2015 18:35:58 +0200 Subject: [PATCH] fix some gtk filechooser issues --- gtk2_ardour/option_editor.cc | 7 ------- gtk2_ardour/option_editor.h | 1 - gtk2_ardour/save_as_dialog.cc | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index d49f8a3be0..54424b5ca3 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -485,7 +485,6 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot { _file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); _file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed)); - _file_chooser.signal_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set)); } @@ -509,9 +508,3 @@ DirectoryOption::selection_changed () { _set (poor_mans_glob(_file_chooser.get_filename ())); } - -void -DirectoryOption::current_folder_set () -{ - _set (poor_mans_glob(_file_chooser.get_current_folder ())); -} diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index 9ab8132d2c..13b0285c32 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -625,7 +625,6 @@ public: private: void selection_changed (); - void current_folder_set (); sigc::slot _get; ///< slot to get the configuration variable's value sigc::slot _set; ///< slot to set the configuration variable's value diff --git a/gtk2_ardour/save_as_dialog.cc b/gtk2_ardour/save_as_dialog.cc index ca2c1f90fa..b537f85c1a 100644 --- a/gtk2_ardour/save_as_dialog.cc +++ b/gtk2_ardour/save_as_dialog.cc @@ -85,7 +85,7 @@ SaveAsDialog::name_entry_changed () string SaveAsDialog::new_parent_folder () const { - return new_parent_folder_selector.get_current_folder (); + return new_parent_folder_selector.get_filename (); } string