projects / pithos-ms-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1ec746a)
Added fix for directory content types generated by Firefox.
authorpkanavos <pkanavos@gmail.com>
Tue, 20 Mar 2012 16:09:44 +0000 (18:09 +0200)
committerpkanavos <pkanavos@gmail.com>
Tue, 20 Mar 2012 16:09:44 +0000 (18:09 +0200)
Fixes #2227

trunk/NetSparkle/NetSparkleForm.cs patch | blob | history
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs patch | blob | history
trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs patch | blob | history
trunk/Pithos.Installer/rnotes.0.7.20314.html [new file with mode: 0644] patch | blob
trunk/Pithos.Installer/versioninfo.xml patch | blob | history
trunk/Pithos.Interfaces/ObjectInfo.cs patch | blob | history

diff --git a/trunk/NetSparkle/NetSparkleForm.cs b/trunk/NetSparkle/NetSparkleForm.cs
index 5e12654..cc1b08c 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
index 0000000..a643390
--- /dev/null
+++ b/trunk/Pithos.Installer/rnotes.0.7.20314.html
@@ -0,0 +1,12 @@
+<html>
+<body>
+<h2>Pithos MS Client v. 0.7.20314</h2>
+Release Date: March 20, 2012, 18:00
+<br/>
+Includes:
+<br/>
+<ul>
+<li> Fixed handling of directories generated by Firefox</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/trunk/Pithos.Installer/versioninfo.xml b/trunk/Pithos.Installer/versioninfo.xml
index ea7c585..2eeb500 100644 (file)
--- a/trunk/Pithos.Installer/versioninfo.xml
+++ b/trunk/Pithos.Installer/versioninfo.xml
@@ -5,7 +5,18 @@
                <title>Pithos MS Client</title>      \r
                <link>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/changes/trunk/Pithos.Installer/versioninfo.xml</link>     \r
                <description></description>      \r
-               <language>en</language>                 \r
+               <language>en</language>                                 \r
+               <item>            \r
+                       <title>Version 0.7.20314</title>\r
+                       <sparkle:releaseNotesLink>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20314.html</sparkle:releaseNotesLink>\r
+                       <pubDate>Tue, 20 Mar 2012 18:00:00 +0200</pubDate>\r
+                       <enclosure \r
+                               url="https://code.grnet.gr/attachments/download/1027/PithosPlus_Setupv0.7.20314.0.exe"\r
+                               length="4335120" \r
+                               type="application/octet-stream"\r
+                               sparkle:version="0.7.20314" \r
+                       />\r
+               </item>\r
                <item>            \r
                        <title>Version 0.7.20313</title>\r
                        <sparkle:releaseNotesLink>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20313.html</sparkle:releaseNotesLink>\r
diff --git a/trunk/Pithos.Interfaces/ObjectInfo.cs b/trunk/Pithos.Interfaces/ObjectInfo.cs
index fa97feb..54f68ad 100644 (file)
--- 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;
             }
         }
 
Unnamed repository; edit this file 'description' to name the repository.