Author: lluis
Date: 2008-01-18 08:56:54 -0500 (Fri, 18 Jan 2008)
New Revision: 93250
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
Log:
* MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs: Added new
override.
* MonoDevelop.Core/Runtime.cs: Use a version specific default MD add-in
repo.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-01-18
13:19:47 UTC (rev 93249)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-01-18
13:56:54 UTC (rev 93250)
@@ -1,3 +1,10 @@
+2008-01-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs: Added new
+ override.
+ * MonoDevelop.Core/Runtime.cs: Use a version specific default MD add-in
+ repo.
+
2008-01-17 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Core.Execution/ProcessHostController.cs:
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2008-01-18 13:19:47 UTC (rev 93249)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2008-01-18 13:56:54 UTC (rev 93250)
@@ -71,14 +71,14 @@
AddinManager.Registry.Update (null);
setupService = new SetupService (AddinManager.Registry);
- string version = AddinManager.CurrentAddin.Version;
+ string mainRep = "http://go-mono.com/md/"; +
AddinManager.CurrentAddin.Version + "/main.mrep";
AddinRepository[] repos =
setupService.Repositories.GetRepositories ();
foreach (AddinRepository rep in repos) {
- if (rep.Url.StartsWith
("http://go-mono.com/md/";))
+ if (rep.Url.StartsWith
("http://go-mono.com/md/";) && rep.Url != mainRep)
setupService.Repositories.RemoveRepository (rep.Url);
}
- setupService.Repositories.RegisterRepository (null,
"http://go-mono.com/md/"; + AddinManager.CurrentAddin.Version + "/main.mrep",
false);
+ setupService.Repositories.RegisterRepository (null,
mainRep, false);
ServiceManager.Initialize ();
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs
2008-01-18 13:19:47 UTC (rev 93249)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/NullProgressMonitor.cs
2008-01-18 13:56:54 UTC (rev 93250)
@@ -142,12 +142,7 @@
void IAsyncOperation.Cancel ()
{
- lock (this) {
- if (canceled) return;
- canceled = true;
- }
- if (cancelRequestedEvent != null)
- cancelRequestedEvent (this);
+ OnCancelRequested ();
}
void IAsyncOperation.WaitForCompleted ()
@@ -201,6 +196,16 @@
}
}
+ protected virtual void OnCancelRequested ()
+ {
+ lock (this) {
+ if (canceled) return;
+ canceled = true;
+ }
+ if (cancelRequestedEvent != null)
+ cancelRequestedEvent (this);
+ }
+
protected virtual void OnCompleted ()
{
if (completedEvent != null)
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
