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

List:       kde-commits
Subject:    Re: [kdelibs] kioslave/http: Workaround yet another incorrect
From:       David Faure <faure () kde ! org>
Date:       2011-06-30 21:48:52
Message-ID: 201106302348.52973.faure () kde ! org
[Download RAW message or body]

On Thursday 30 June 2011, Dawit Alemayehu wrote:
> Git commit 4e7a01e45966b2104fa30a7cb187a8e9228bcbd1 by Dawit Alemayehu.
> Committed on 26/06/2011 at 23:39.
> Pushed by adawit into branch 'master'.
> 
> Workaround yet another incorrect mime-type (image/x-ico) sent by a server.
> 
> BUG: 275547
> FIXED-IN:4.6.5
> 
> (cherry picked from commit 03f6549292d8c5d32e7f3c58af48cea6fdaecc74)
> 
> M  +2    -0    kioslave/http/http.cpp
> 
> http://commits.kde.org/kdelibs/4e7a01e45966b2104fa30a7cb187a8e9228bcbd1
> 
> diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
> index 9bbd531..00f95e2 100644
> --- a/kioslave/http/http.cpp
> +++ b/kioslave/http/http.cpp
> @@ -2655,6 +2655,8 @@ 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");

Why is this necessary?
shared-mime-info already defines image/x-icon as an alias for 
image/vnd.microsoft.icon.
And nowadays, KMimeType::mimeType() does alias resolution by default.

-- 
David Faure, faure@kde.org, http://www.davidfaure.fr
Sponsored by Nokia to work on KDE, incl. Konqueror (http://www.konqueror.org).
[prev in list] [next in list] [prev in thread] [next in thread]