[Ide] Don't dispose List/TreeStore as we don't own it, the treeview does.

19 files changed, 4 insertions, 108 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
index dc254ce2a5..feb26e4e63 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
@@ -265,14 +265,6 @@ namespace MonoDevelop.CSharp.ClassOutline
 				return;
 			var w = (ScrolledWindow)outlineTreeView.Parent;
 			w.Destroy ();
-			if (outlineTreeModelSort != null) {
-				outlineTreeModelSort.Dispose ();
-				outlineTreeModelSort = null;
-			}
-			if (outlineTreeStore != null) {
-				outlineTreeStore.Dispose ();
-				outlineTreeStore = null;
-			}
 			outlineTreeView = null;
 			settings = null;
 			foreach (var tw in toolbarWidgets)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
index 26ebd30cca..c98423fcf2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
@@ -111,15 +111,6 @@ namespace MonoDevelop.CSharp.Project
 			langVerCombo.Model = langVerStore;
 			langVerCombo.Active = (int) compilerParameters.LangVersion;
 		}
-		
-		protected override void OnDestroyed ()
-		{
-			if (classListStore != null) {
-				classListStore.Dispose ();
-				classListStore = null;
-			}
-			base.OnDestroyed ();
-		}
 
 		public bool ValidateChanges ()
 		{
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index 40d9237d70..84bacba198 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -1504,16 +1504,9 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 			
 			ActiveMember = null;
-			if (memberListStore != null) {
-				memberListStore.Dispose ();
-				memberListStore = null;
-			}
-			
-			if (typeListStore != null) {
-				typeListStore.Dispose ();
-				typeListStore = null;
-			}
-			
+			memberListStore = null;
+			typeListStore = null;
+
 			if (documentationPanel != null) {
 				documentationPanel.Destroy ();
 				documentationPanel = null;
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 3063b00c27..cdf57814d4 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -852,7 +852,6 @@ namespace MonoDevelop.Gettext
 				return entry1.GetTranslation (0).CompareTo (entry2.GetTranslation (0));
 			});
 			IdeApp.Workbench.StatusBar.ShowMessage (string.Format (GettextCatalog.GetPluralString ("Found {0} catalog entry.", "Found {0} catalog entries.", found), found));
-			store.Dispose ();
 			treeviewEntries.Model = store = newStore;
 		}
 		
@@ -951,16 +950,6 @@ namespace MonoDevelop.Gettext
 		{
 			MonoDevelop.Ide.Gui.Styles.Changed -= HandleStylesChanged;
 			StopTaskWorkerThread ();
-		
-			if (store != null) {
-				store.Dispose ();
-				store = null;
-			}
-			
-			if (foundInStore != null) {
-				foundInStore.Dispose ();
-				foundInStore = null;
-			}
 			
 			widgets.Remove (this);
 			ClearTasks ();
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
index e1a8cfbdc9..59c8a35c7d 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
@@ -146,10 +146,6 @@ namespace MonoDevelop.RegexToolkit
 		protected override void OnDestroyed ()
 		{
 			base.OnDestroyed ();
-			if (elementsStore != null) {
-				elementsStore.Dispose ();
-				elementsStore = null;
-			}
 			
 			HideTooltipWindow ();
 		}
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
index 2cf57d534b..33488f89da 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
@@ -204,19 +204,6 @@ namespace MonoDevelop.RegexToolkit
 			Ide.IdeApp.Workbench.StatusBar.ShowReady ();
 		}
 		
-		protected override void OnDestroyed ()
-		{
-			base.OnDestroyed ();
-			if (optionsStore != null) {
-				optionsStore.Dispose ();
-				optionsStore = null;
-			}
-			if (resultStore != null) {
-				resultStore.Dispose ();
-				resultStore = null;
-			}
-		}
-		
 		
 		RegexOptions GetOptions ()
 		{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
index 1ae5f82c2f..07b696e243 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
@@ -78,11 +78,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			DefaultSourceEditorOptions.Instance.ColorScheme = schemeName;
 
-			if (styleStore != null) {
-				styleStore.Dispose ();
-				styleStore = null;
-			}
-
 			MonoDevelop.Ide.Gui.Styles.Changed -= HandleThemeChanged;
 			base.OnDestroyed ();
 		}
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
index 091402071e..dc4afb12c9 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
@@ -258,8 +258,6 @@ namespace MonoDevelop.TextTemplating.Gui
 			Gtk.ScrolledWindow w = (Gtk.ScrolledWindow) outlineTreeView.Parent;
 			w.Destroy ();
 			outlineTreeView.Destroy ();
-			outlineTreeStore.Dispose ();
-			outlineTreeStore = null;
 			outlineTreeView = null;
 		}
 		
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index c06de4b975..4a3a8bf71b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -177,11 +177,7 @@ namespace MonoDevelop.VersionControl.Views
 				colCommit.Destroy ();
 				colCommit = null;
 			}
-			
-			if (filestore != null) {
-				filestore.Dispose ();
-				filestore = null;
-			}
+
 			if (this.diffRenderer != null) {
 				this.diffRenderer.Destroy ();
 				this.diffRenderer = null;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
index df56bc1e7b..8d2a386e15 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
@@ -99,10 +99,6 @@ namespace MonoDevelop.VersionControl.Views
 				widget.Destroy ();
 				widget = null;
 			}
-			if (changedpathstore != null) {
-				changedpathstore.Dispose ();
-				changedpathstore = null;
-			}
 			if (info != null) {
 				info.Updated -= OnInfoUpdated;
 				info = null;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
index 2bcc3641eb..0c133b41c7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
@@ -501,9 +501,6 @@ namespace MonoDevelop.VersionControl.Views
 			refreshButton.Clicked -= RefreshClicked;
 			Ide.Gui.Styles.Changed -= HandleStylesChanged;
 
-			logstore.Dispose ();
-			changedpathstore.Dispose ();
-
 			diffRenderer.Dispose ();
 			messageRenderer.Dispose ();
 			textRenderer.Dispose ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index 68bc41da23..cac4d4c09e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -398,10 +398,6 @@ namespace MonoDevelop.VersionControl.Views
 				colFile.Destroy ();
 				colFile = null;
 			}
-			if (filestore != null) {
-				filestore.Dispose ();
-				filestore = null;
-			}
 			if (filelist != null) {
 				filelist.DoPopupMenu = null;
 				filelist.RowActivated -= OnRowActivated;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
index 60dd49c526..65b4fe6703 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
@@ -281,7 +281,6 @@ namespace MonoDevelop.Ide.FindInFiles
 			buttonStop.Sensitive = false;
 			treeviewSearchResults.Model = newStore;
 
-			store.Dispose ();
 			store = newStore;
 
 			treeviewSearchResults.ThawChildNotify ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
index 51ab0efc3e..9c70150eb7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
@@ -2126,7 +2126,6 @@ namespace MonoDevelop.Ide.Gui.Components
 
 			if (store != null) {
 				Clear ();
-				store.Dispose ();
 				store = null;
 			}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
index caceb45d9b..b1f1ac456b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
@@ -116,10 +116,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 				textRender.Destroy ();
 				textRender = null;
 			}
-			if (tsFiles != null) {
-				tsFiles.Dispose ();
-				tsFiles = null;
-			}
 			base.OnDestroyed ();
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
index 5811a86f9a..fdfed0f9f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs
@@ -296,7 +296,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 				if (disp != null)
 					disp.Dispose ();
 			}
-			store.Dispose ();
 			base.OnDestroyed ();
 		}
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
index 98e86aba2c..f13995b651 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
@@ -653,13 +653,6 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 		{
 		}
 
-		protected override void OnDestroyed ()
-		{
-			keyStore.Dispose ();
-			filterModel.Dispose ();
-			base.OnDestroyed ();
-		}
-
 		class KeyBindingSelectedEventArgs : EventArgs
 		{
 			public int SelectedKey { get; private set; }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
index a886c44628..2a41eb9321 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs
@@ -154,16 +154,6 @@ namespace MonoDevelop.Ide.Projects
 			}
 		}
 
-
-		protected override void OnDestroyed ()
-		{
-			if (catStore != null) {
-				catStore.Dispose ();
-				catStore = null;
-			}
-			base.OnDestroyed ();
-		}
-
 		static string GetCategoryPropertyKey (Project proj)
 		{
 			string key = "Dialogs.NewFileDialog.LastSelectedCategory";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs
index 6f7aafa6eb..f849c26eea 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs
@@ -591,12 +591,6 @@ namespace MonoDevelop.Ide.Projects
 			{
 				templateStore.Clear ();
 			}
-			
-			protected override void OnDestroyed ()
-			{
-				filterModel.Dispose ();
-				templateStore.Dispose ();
-			}
 		}
 		
 		class TemplateItem