Author: mhutch
Date: 2008-02-04 12:26:19 -0500 (Mon, 04 Feb 2008)
New Revision: 94766
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
Log:
* MonoDevelop.Core/Runtime.cs: Use MD's config directory for addin
engine too. More cross-platform safe, and ensures that they're
always the same directory (previously, unusual combinations of
environment variables could cause them to differ).
* MonoDevelop.Core/PropertyService.cs: Make config directory more
cross-platform safe.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-02-04
17:25:30 UTC (rev 94765)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-02-04
17:26:19 UTC (rev 94766)
@@ -1,3 +1,12 @@
+2008-02-04 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core/Runtime.cs: Use MD's config directory for addin
engine
+ too. More cross-platform safe, and ensures that they're always the
same
+ directory (previously, unusual combinations of environment variables
+ could cause them to differ).
+ * MonoDevelop.Core/PropertyService.cs: Make config directory more
+ cross-platform safe.
+
2008-01-25 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core.addin.xml: Update MD version.
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
2008-02-04 17:25:30 UTC (rev 94765)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
2008-02-04 17:26:19 UTC (rev 94766)
@@ -48,9 +48,7 @@
public static string ConfigPath {
get {
- string configPath =
Environment.GetEnvironmentVariable ("XDG_CONFIG_HOME");
- if (String.IsNullOrEmpty (configPath))
- configPath = Path.Combine
(Environment.GetEnvironmentVariable ("HOME"), ".config");
+ string configPath = Environment.GetFolderPath
(Environment.SpecialFolder.ApplicationData);
return Path.Combine (configPath, "MonoDevelop");
}
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2008-02-04 17:25:30 UTC (rev 94765)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2008-02-04 17:26:19 UTC (rev 94766)
@@ -61,10 +61,7 @@
AddinManager.AddinLoaded += OnLoad;
AddinManager.AddinUnloaded += OnUnload;
- string configDir = System.IO.Path.Combine
(Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".config");
- configDir = System.IO.Path.Combine (configDir,
"MonoDevelop");
-
- AddinManager.Initialize (configDir);
+ AddinManager.Initialize
(MonoDevelop.Core.PropertyService.ConfigPath);
AddinManager.InitializeDefaultLocalizer (new
DefaultAddinLocalizer ());
if (updateAddinRegistry)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
