[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_kioslave/http=3A_Reverted_previous_commi?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-07-07 4:55:21
Message-ID: 20110707045521.791EDA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit a495e33fa7781b8f9c1c88d7425778ec8bfb8cb9 by Dawit Alemayehu.
Committed on 07/07/2011 at 06:48.
Pushed by adawit into branch 'master'.

Reverted previous commit that worked around incorrect mime-type for
the Microsoft icon image format.

(cherry picked from commit d26cc08799ed39619d80eb3e019b2884dff8b114)

M  +0    -2    kioslave/http/http.cpp     

http://commits.kde.org/kdelibs/a495e33fa7781b8f9c1c88d7425778ec8bfb8cb9

diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
index 00f95e2..9bbd531 100644
--- a/kioslave/http/http.cpp
+++ b/kioslave/http/http.cpp
@@ -2655,8 +2655,6 @@ void HTTPProtocol::fixupResponseMimetype()
         m_mimeType = QLatin1String("audio/x-wav");
     else if (m_mimeType == QLatin1String("image/x-ms-bmp"))
         m_mimeType = QLatin1String("image/bmp");
-    else if (m_mimeType == QLatin1String("image/x-icon"))
-        m_mimeType = QLatin1String("image/vnd.microsoft.icon");
 
     // Crypto ones....
     else if (m_mimeType == QLatin1String("application/pkix-cert") ||

[prev in list] [next in list] [prev in thread] [next in thread]