[tomboy/xdg-migration2: 13/16] Fix addin* migration.



commit 85bc864ffdc77d41991a6e4171e3f223f79ad52a
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sun Aug 23 09:11:43 2009 -0700

    Fix addin* migration.

 Tomboy/AddinManager.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/Tomboy/AddinManager.cs b/Tomboy/AddinManager.cs
index f827a12..faec6bf 100644
--- a/Tomboy/AddinManager.cs
+++ b/Tomboy/AddinManager.cs
@@ -60,14 +60,9 @@ namespace Tomboy
 		{
 			Logger.Info ("Initializing Mono.Addins");
 
-			string addins_dir = Path.Combine (tomboy_conf_dir, "addins");
-			if (!Directory.Exists (addins_dir))
-				Directory.CreateDirectory (addins_dir);
-
 			// Perform migration if necessary
 			if (!String.IsNullOrEmpty (old_conf_dir)) {
 				foreach (string dir_path in Directory.GetDirectories (old_conf_dir, "addin*")) {
-					// TODO: Check existence stuff
 					string new_dir_path =
 						Path.Combine (tomboy_conf_dir, Path.GetFileName (dir_path));
 					if (!Directory.Exists (new_dir_path))
@@ -75,6 +70,10 @@ namespace Tomboy
 				}
 			}
 
+			string addins_dir = Path.Combine (tomboy_conf_dir, "addins");
+			if (!Directory.Exists (addins_dir))
+				Directory.CreateDirectory (addins_dir);
+
 			// Make sure a Tomboy.addins file exists
 			string addins_file = Path.Combine (addins_dir, "Tomboy.addins");
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]