X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Freturn_ui.cc;h=16c4720577579e037514aab841e0e608a0b9dacc;hb=4167e83972331e8a5be08c76cc3dccd409c6ac5e;hp=76705ccf87e11da6e26ff92ba55e93b3e9633537;hpb=75b933eadbe8f90a73a29bb207ff26eebcd4121a;p=ardour.git

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 76705ccf87..16c4720577 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -23,7 +23,6 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/return.h"
 
-#include "utils.h"
 #include "return_ui.h"
 #include "io_selector.h"
 #include "ardour_ui.h"
@@ -42,7 +41,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
  	_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
 
 	_hbox.pack_start (_gpm, true, true);
-	set_name ("ReturnUIFrame");
+	set_name (X_("ReturnUIFrame"));
 
 	_vbox.set_spacing (5);
 	_vbox.set_border_width (5);
@@ -61,7 +60,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
 	_return->input()->changed.connect (input_change_connection, invalidator (*this), boost::bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
 
 	_gpm.setup_meters ();
-	_gpm.set_fader_name ("ReturnUIFrame");
+	_gpm.set_fader_name (X_("ReturnUIFader"));
 
 	// screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::update));
 	fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
@@ -110,19 +109,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);
-}
-