diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
commit | 4c9ebf6bdd2d5113a3dab2a457a781ab68aae80a (patch) | |
tree | 76af8de89b1376e8ecb60158aa1c8f3535aaeada /main/src/addins/MonoDevelop.GtkCore | |
parent | a3660b4ee48c7df4ef33a6131db23e68303dfb62 (diff) | |
parent | 1877f337ee00e0487ca2522ed22893fc87b18b6b (diff) |
Merge remote-tracking branch 'origin/master' into roslyn
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
main/src/addins/NUnit/Services/NUnitService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.GtkCore')
3 files changed, 3 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs index f840065952..953295bfcb 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs @@ -178,7 +178,7 @@ namespace MonoDevelop.GtkCore.Dialogs public void Dispose () { - dialog.Destroy (); + dialog.Dispose (); } } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs index ae23733dde..de6b5ecbc3 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs @@ -63,7 +63,7 @@ namespace MonoDevelop.GtkCore.Dialogs public void Dispose () { - dialog.Destroy (); + dialog.Dispose (); } public int Run () diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs index c201ac0063..0b74290fe3 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs @@ -88,7 +88,7 @@ namespace MonoDevelop.GtkCore.Dialogs public void Dispose () { - dialog.Destroy (); + dialog.Dispose (); } } |