From 7153da407314267b9a2355914c786dce922a02ed Mon Sep 17 00:00:00 2001 From: pkanavos Date: Tue, 20 Mar 2012 18:09:44 +0200 Subject: [PATCH] Added fix for directory content types generated by Firefox. Fixes #2227 --- trunk/NetSparkle/NetSparkleForm.cs | 3 ++- trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | 4 ++-- trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs | 1 - trunk/Pithos.Installer/rnotes.0.7.20314.html | 12 ++++++++++++ trunk/Pithos.Installer/versioninfo.xml | 13 ++++++++++++- trunk/Pithos.Interfaces/ObjectInfo.cs | 6 +++++- 6 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 trunk/Pithos.Installer/rnotes.0.7.20314.html diff --git a/trunk/NetSparkle/NetSparkleForm.cs b/trunk/NetSparkle/NetSparkleForm.cs index 5e12654..cc1b08c 100644 --- a/trunk/NetSparkle/NetSparkleForm.cs +++ b/trunk/NetSparkle/NetSparkleForm.cs @@ -41,7 +41,8 @@ namespace AppLimit.NetSparkle { //Download the content instead of navigating to it, to bypass //the Content-Disposition header - NetSparkleBrowser.DocumentText = client.DownloadString(item.ReleaseNotesLink); + string notes = client.DownloadString(item.ReleaseNotesLink); + NetSparkleBrowser.DocumentText = notes; } } else diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs index 7788bfe..8d9cf0e 100644 --- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs +++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs @@ -93,5 +93,5 @@ using System.Windows; // 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("0.7.20313.0")] -[assembly: AssemblyFileVersionAttribute("0.7.20313.0")] +[assembly: AssemblyVersion("0.7.20314.0")] +[assembly: AssemblyFileVersionAttribute("0.7.20314.0")] diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs index 0a0ce39..fc1f43f 100644 --- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs +++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs @@ -240,7 +240,6 @@ namespace Pithos.Client.WPF { public void CheckForUpgrade() { ShowBalloonFor(new Notification{Title="Checking for upgrades",Message="Contacting the server to retrieve the latest Pithos+ version."}); - Log.Error("Test Error message"); _sparkle.StopLoop(); _sparkle.updateDetected -= OnUpgradeDetected; _sparkle.checkLoopFinished -= OnCheckFinished; diff --git a/trunk/Pithos.Installer/rnotes.0.7.20314.html b/trunk/Pithos.Installer/rnotes.0.7.20314.html new file mode 100644 index 0000000..a643390 --- /dev/null +++ b/trunk/Pithos.Installer/rnotes.0.7.20314.html @@ -0,0 +1,12 @@ + + +

Pithos MS Client v. 0.7.20314

+Release Date: March 20, 2012, 18:00 +
+Includes: +
+ + + \ No newline at end of file diff --git a/trunk/Pithos.Installer/versioninfo.xml b/trunk/Pithos.Installer/versioninfo.xml index ea7c585..2eeb500 100644 --- a/trunk/Pithos.Installer/versioninfo.xml +++ b/trunk/Pithos.Installer/versioninfo.xml @@ -5,7 +5,18 @@ Pithos MS Client https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/changes/trunk/Pithos.Installer/versioninfo.xml - en + en + + Version 0.7.20314 + https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20314.html + Tue, 20 Mar 2012 18:00:00 +0200 + + Version 0.7.20313 https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20313.html diff --git a/trunk/Pithos.Interfaces/ObjectInfo.cs b/trunk/Pithos.Interfaces/ObjectInfo.cs index fa97feb..54f68ad 100644 --- a/trunk/Pithos.Interfaces/ObjectInfo.cs +++ b/trunk/Pithos.Interfaces/ObjectInfo.cs @@ -345,7 +345,11 @@ namespace Pithos.Interfaces { get { - return String.Equals(Content_Type, @"application/directory",StringComparison.InvariantCultureIgnoreCase); + if (Content_Type.StartsWith(@"application/directory",StringComparison.InvariantCultureIgnoreCase)) + return true; + if (Content_Type.StartsWith(@"application/folder",StringComparison.InvariantCultureIgnoreCase)) + return true; + return false; } } -- 1.7.10.4