From 8da39177b31c735ee314f395a78858530da7886e Mon Sep 17 00:00:00 2001 From: "michael.letterle" Date: Mon, 30 Nov 2009 23:18:38 +0000 Subject: [PATCH] First start of changes to support Mono. * Growl/_source/Utility.cs: * Growl/_source/DisplayStyleManager.cs: Uses platform independent directory separator. --- Growl/Growl/_source/DisplayStyleManager.cs | 4 ++-- Growl/Growl/_source/Utility.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Growl/Growl/_source/DisplayStyleManager.cs b/Growl/Growl/_source/DisplayStyleManager.cs index 6472cbf..634412a 100644 --- a/Growl/Growl/_source/DisplayStyleManager.cs +++ b/Growl/Growl/_source/DisplayStyleManager.cs @@ -14,8 +14,8 @@ internal sealed class DisplayStyleManager internal delegate void DisplayLoadedEventHandler(string displayName); internal static event DisplayLoadedEventHandler DisplayLoaded; - private static string appDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Application.StartupPath, @"Displays\"); - private static string userDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.UserSettingFolder, @"Displays\"); + private static string appDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Application.StartupPath, @"Displays" + Path.DirectorySeparatorChar); + private static string userDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.UserSettingFolder, @"Displays" + Path.DirectorySeparatorChar); private static Dictionary currentlyLoadedDisplayStyles = new Dictionary(); private static Dictionary settingsPanels = new Dictionary(); private static Dictionary availableDisplays; diff --git a/Growl/Growl/_source/Utility.cs b/Growl/Growl/_source/Utility.cs index 26105f7..25aab3d 100644 --- a/Growl/Growl/_source/Utility.cs +++ b/Growl/Growl/_source/Utility.cs @@ -45,12 +45,12 @@ static Utility() fileVersionInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(a.Location); string root = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); - string folder = String.Format(@"Growl\{0}", a.GetName().Version.ToString()); - string folderBeta = @"Growl\2.0b2"; + string folder = String.Format(@"Growl" + System.IO.Path.DirectorySeparatorChar + "{0}", a.GetName().Version.ToString()); + string folderBeta = @"Growl" + System.IO.Path.DirectorySeparatorChar + "2.0b2"; userSettingsFolder = System.IO.Path.Combine(root, folder); - if (!userSettingsFolder.EndsWith(@"\")) userSettingsFolder += @"\"; + if (!userSettingsFolder.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) userSettingsFolder += System.IO.Path.DirectorySeparatorChar; userSettingsFolderBeta = System.IO.Path.Combine(root, folderBeta); - if (!userSettingsFolderBeta.EndsWith(@"\")) userSettingsFolderBeta += @"\"; + if (!userSettingsFolderBeta.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) userSettingsFolderBeta += System.IO.Path.DirectorySeparatorChar; Growl.CoreLibrary.PathUtility.EnsureDirectoryExists(userSettingsFolder); }