From cf6f83146a0d8ea0e0c8dccc9a4595ac4387f659 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Tue, 1 Dec 2009 00:34:45 +0000
Subject: [PATCH] Clean up confusion wrt showing the bundle manager.  Fixes
 #2930.

git-svn-id: svn://localhost/ardour2/branches/3.0@6230 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour.menus.in   |  1 -
 gtk2_ardour/editor.cc         | 10 ----------
 gtk2_ardour/editor.h          |  1 -
 gtk2_ardour/editor_actions.cc |  2 --
 4 files changed, 14 deletions(-)

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index e997262a01..afb6647f12 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -427,7 +427,6 @@
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
                <menuitem action='toggle-rhythm-ferret'/>
-               <menuitem action='toggle-bundle-manager'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
                <menuitem action='toggle-log-window'/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 0ade4e1563..9034f4820a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4688,16 +4688,6 @@ Editor::show_rhythm_ferret ()
 	rhythm_ferret->present ();
 }
 
-void
-Editor::show_bundle_manager ()
-{
-	if (_bundle_manager == 0) {
-		_bundle_manager = new BundleManager (*session);
-	}
-
-	_bundle_manager->show ();
-}
-
 void
 Editor::show_global_port_matrix (ARDOUR::DataType t)
 {
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 34e810e345..684637740c 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -412,7 +412,6 @@ class Editor : public PublicEditor
 	void toggle_meter_updating();
 
 	void show_rhythm_ferret();
-	void show_bundle_manager ();
 	void show_global_port_matrix (ARDOUR::DataType);
 
 	void goto_visual_state (uint32_t);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 25239ef356..898edf6041 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -566,8 +566,6 @@ Editor::register_actions ()
 	ActionManager::region_selection_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-rhythm-ferret", _("Rhythm Ferret"), mem_fun(*this, &Editor::show_rhythm_ferret));
 	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (editor_actions, "toggle-bundle-manager", _("Bundle Manager"), mem_fun (*this, &Editor::show_bundle_manager));
-	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-audio-connection-manager", _("Audio Connection Manager"), bind (mem_fun (*this, &Editor::show_global_port_matrix), ARDOUR::DataType::AUDIO));
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-midi-connection-manager", _("MIDI Connection Manager"), bind (mem_fun (*this, &Editor::show_global_port_matrix), ARDOUR::DataType::MIDI));