merge with master and fix 4 conflicts by hand

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 92846af4697522dc4cbc36b7f7b5ba07f462b7a1..9e86abd17128a1425e393cdc9efc38cc2e4c8f73 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -49,7 +49,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
 
        _vbox.pack_start (_hbox, false, false, false);
 
-       io = manage (new IOSelector (parent, session, r->output()));
+       io = Gtk::manage (new IOSelector (parent, session, r->output()));
 
        pack_start (_vbox, false, false);
 
@@ -110,19 +110,9 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
 
        set_name ("ReturnUIWindow");
 
-       r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
 {
        delete ui;
 }
-
-void
-ReturnUIWindow::return_going_away ()
-{
-       ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
-       going_away_connection.disconnect ();
-       delete_when_idle (this);
-}
-