patch for setup forms

quick patch to fix listing in Paths form on SFTP
pstagner · Jul 11, 2013 · cbe336d · cbe336d
1 parent 371e4c4
commit cbe336d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 50 deletions.
diff --git a/FTPboxLib/FTPboxLib.v11.suo b/FTPboxLib/FTPboxLib.v11.suo
diff --git a/FTPboxLib/FTPboxLib/Common.cs b/FTPboxLib/FTPboxLib/Common.cs
@@ -79,7 +79,7 @@ public static string GetCommonPath(string p, bool fromLocal)
                 var rp = Profile.RemotePath ?? "/";
                 if (rp.StartsWith(Profile.HomePath)) rp = rp.Substring(Profile.HomePath.Length);
 
-                if (rp.StartsWith("/")) rp = rp.Substring(1);
+                if (rp.StartsWith("/") && !rp.Equals("/")) rp = rp.Substring(1);
                 if (rp.Equals(p))
                     p = "/";
                 else if (p.StartsWith(rp))
@@ -88,8 +88,8 @@ public static string GetCommonPath(string p, bool fromLocal)
             if (fromLocal || File.Exists(p) || Directory.Exists(p))
             {
                 if (p.Equals(Profile.LocalPath)) return ".";
-
-                if (p.StartsWith(Profile.LocalPath))
+                
+                if (!string.IsNullOrWhiteSpace(Profile.LocalPath) && p.StartsWith(Profile.LocalPath))
                 {
                     p = p.Substring(Profile.LocalPath.Length);
                     p.ReplaceSlashes();

diff --git a/FTPboxLib/FTPboxLib/Properties/AssemblyInfo.cs b/FTPboxLib/FTPboxLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.1.1")]
-[assembly: AssemblyFileVersion("2.4.1.1")]
+[assembly: AssemblyVersion("2.4.2.1")]
+[assembly: AssemblyFileVersion("2.4.2.1")]
diff --git a/Windows/FTPbox.suo b/Windows/FTPbox.suo
diff --git a/Windows/FTPbox/FTPboxLib.dll b/Windows/FTPbox/FTPboxLib.dll
diff --git a/Windows/FTPbox/Forms/Paths.cs b/Windows/FTPbox/Forms/Paths.cs
@@ -33,6 +33,7 @@ private void bDone_Click(object sender, EventArgs e)
 
             var rp = string.Format("{0}/{1}", Profile.HomePath, tFullDir.Text.RemoveSlashes());
 			while (rp.StartsWith("//")) rp = rp.Substring(1);
+            rp = rp.Replace("//", "/");
 
             Profile.AddPaths(rp, tPath.Text, tParent.Text);
 

diff --git a/Windows/FTPbox/Properties/AssemblyInfo.cs b/Windows/FTPbox/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.1.1")]
-[assembly: AssemblyFileVersion("2.4.1.1")]
+[assembly: AssemblyVersion("2.4.2.1")]
+[assembly: AssemblyFileVersion("2.4.2.1")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Windows/FTPbox_setup/FTPbox_setup.vdproj b/Windows/FTPbox_setup/FTPbox_setup.vdproj
@@ -112,61 +112,61 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_501FEBDA4AB44963BC62217164703C1C"
+        "OwnerKey" = "8:_C0AEE24927AB3D33882558AF4110D9F7"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_231F280B5764E3735C4853E2CFD9F4C9"
+        "OwnerKey" = "8:_A5BDDDAF0A5C1DDE259B33C500918545"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C49C32279B13A862C77237DAE722CBB3"
+        "OwnerKey" = "8:_79E027320435F9386BD88D1BCD24C2BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C5C6DDEE5A218FF1E4463CF6EE7E9A0E"
+        "OwnerKey" = "8:_29A4944BAF5E2FBD24FF3EF210C9541B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_711A399CE7394DEE73EF06FD1E6A4B31"
+        "OwnerKey" = "8:_49B3F435DB37C06B11FBC6B80EE5CD32"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_49B3F435DB37C06B11FBC6B80EE5CD32"
+        "OwnerKey" = "8:_711A399CE7394DEE73EF06FD1E6A4B31"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_29A4944BAF5E2FBD24FF3EF210C9541B"
+        "OwnerKey" = "8:_C5C6DDEE5A218FF1E4463CF6EE7E9A0E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_79E027320435F9386BD88D1BCD24C2BC"
+        "OwnerKey" = "8:_C49C32279B13A862C77237DAE722CBB3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A5BDDDAF0A5C1DDE259B33C500918545"
+        "OwnerKey" = "8:_231F280B5764E3735C4853E2CFD9F4C9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C0AEE24927AB3D33882558AF4110D9F7"
+        "OwnerKey" = "8:_501FEBDA4AB44963BC62217164703C1C"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -281,11 +281,6 @@
             "AssemblyAsmDisplayName" = "8:FTPboxLib, Version=2.4.1.1, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_231F280B5764E3735C4853E2CFD9F4C9"
-                    {
-                    "Name" = "8:FTPboxLib.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:FTPboxLib.dll"
             "TargetName" = "8:"
@@ -312,11 +307,6 @@
             "AssemblyAsmDisplayName" = "8:Ionic.Zip.Reduced, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_29A4944BAF5E2FBD24FF3EF210C9541B"
-                    {
-                    "Name" = "8:Ionic.Zip.Reduced.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Ionic.Zip.Reduced.dll"
             "TargetName" = "8:"
@@ -343,11 +333,6 @@
             "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_49B3F435DB37C06B11FBC6B80EE5CD32"
-                    {
-                    "Name" = "8:Newtonsoft.Json.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Newtonsoft.Json.dll"
             "TargetName" = "8:"
@@ -425,11 +410,6 @@
             "AssemblyAsmDisplayName" = "8:Renci.SshNet, Version=2013.4.7.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_711A399CE7394DEE73EF06FD1E6A4B31"
-                    {
-                    "Name" = "8:Renci.SshNet.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Renci.SshNet.dll"
             "TargetName" = "8:"
@@ -456,11 +436,6 @@
             "AssemblyAsmDisplayName" = "8:Starksoft.Net.Ftp, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_C49C32279B13A862C77237DAE722CBB3"
-                    {
-                    "Name" = "8:Starksoft.Net.Ftp.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Starksoft.Net.Ftp.dll"
             "TargetName" = "8:"
@@ -487,11 +462,6 @@
             "AssemblyAsmDisplayName" = "8:Starksoft.Net.Proxy, Version=1.0.131.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_C5C6DDEE5A218FF1E4463CF6EE7E9A0E"
-                    {
-                    "Name" = "8:Starksoft.Net.Proxy.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Starksoft.Net.Proxy.dll"
             "TargetName" = "8:"
@@ -609,15 +579,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:FTPbox"
-        "ProductCode" = "8:{AC4481E5-5D96-4C89-A749-1A0A6BA8EB15}"
-        "PackageCode" = "8:{64AF146D-C7E9-49FC-8470-0CD99E1F1BAF}"
+        "ProductCode" = "8:{97C16424-BFBC-4580-AC88-328643D82BE1}"
+        "PackageCode" = "8:{5E3FF5B3-B973-429B-995C-023ADF64C1BC}"
         "UpgradeCode" = "8:{C3AC21D9-1CD1-40EC-A4F8-F482D3922829}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.4.1"
+        "ProductVersion" = "8:2.4.2"
         "Manufacturer" = "8:ftpbox.org"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:ftpbox.org"