diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-16 13:04:37 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-16 13:04:37 +0300 |
| commit | 94a9f99ea493994e1999d8d85fbb014893872821 (patch) | |
| tree | 0570137ec0e75c048a224d882673a4564f606930 /main/src/addins/MonoDevelop.Autotools | |
| parent | efc5a601737e77112a507bb3a4d9dc9526659afe (diff) | |
| parent | 55d5a5dd55a54ee145c294762131da8e987098af (diff) | |
Merge remote-tracking branch 'origin/master' into new-project-model
Conflicts:
main/external/debugger-libs
main/external/fsharpbinding
main/external/mono-addins
main/external/nrefactory
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdateChecker.cs
main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs
main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildHandler.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindReplace.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs index 447b16994e..f245686308 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs @@ -216,7 +216,7 @@ namespace MonoDevelop.Autotools ShowMakefileNotFoundError (e); return false; } catch (Exception e) { - MessageService.ShowException (parentDialog, e, GettextCatalog.GetString ("Specified makefile is invalid: {0}", tmpData.AbsoluteMakefileName)); + MessageService.ShowError (parentDialog, GettextCatalog.GetString ("Specified makefile is invalid: {0}", tmpData.AbsoluteMakefileName), null, e); return false; } @@ -744,8 +744,7 @@ namespace MonoDevelop.Autotools ShowMakefileNotFoundError (e); } catch (Exception e) { if (showError) - MessageService.ShowException (parentDialog,e, - GettextCatalog.GetString ("Error while trying to read the specified Makefile")); + MessageService.ShowError (parentDialog, GettextCatalog.GetString ("Error while trying to read the specified Makefile"), null, e); return null; } @@ -938,9 +937,7 @@ namespace MonoDevelop.Autotools void ShowMakefileNotFoundError (Exception e) { - MessageService.ShowException (parentDialog, - e, - GettextCatalog.GetString ("Unable to find the specified Makefile. You need to specify the path to an existing Makefile for use with the 'Makefile Integration' feature.")); + MessageService.ShowError (parentDialog, GettextCatalog.GetString ("Unable to find the specified Makefile. You need to specify the path to an existing Makefile for use with the 'Makefile Integration' feature.")); } // Returns true if either |