many changes, read the diffs

git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 6 deletions

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 564cc4dca2..c62c7a2e90 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -575,15 +575,12 @@ LocationUI::LocationUI ()
 	set_wmclass(_("ardour_locations"), "Ardour");
 
 	set_name ("LocationWindow");
-	signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast<Window*>(this)));
-
-	add (location_hpacker);
 
+	get_vbox()->pack_start (location_hpacker);
 
 	location_vpacker.set_border_width (10);
 	location_vpacker.set_spacing (5);
 
-
 	location_vpacker.pack_start (loop_edit_row, false, false);
 	location_vpacker.pack_start (punch_edit_row, false, false);
 
@@ -857,7 +854,13 @@ LocationUI::session_gone()
 
 	punch_edit_row.set_session (0);
 	punch_edit_row.set_location (0);
-	
-	ArdourDialog::session_gone();
+
+	ArdourDialog::session_gone ();
 }
 
+bool
+LocationUI::on_delete_event (GdkEventAny* ev)
+{
+	hide ();
+	return true;
+}