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

List:       kde-commits
Subject:    Re: KDE/kdelibs/kio/kio
From:       Clarence Dang <dang () kde ! org>
Date:       2007-04-30 23:45:02
Message-ID: 200705010945.04319.dang () kde ! org
[Download RAW message or body]

From the record, I mean KDE 3.5, not 3.3.

On Sunday 29 April 2007 23:13, Clarence Dang wrote:
> SVN commit 659101 by dang:
>
> Don't claim to support empty mimetypes (e.g. kdelibs/kimgio/xv.desktop).
>
> Now, KImageIO::mimeTypes (KImageIO::Writing) does not return any empty
> mimetype like in KDE 3.3 (this makes 'kolourpaint doesnotexist.png',
> followed by CTRL+S, bring up the save filedialog again).
>
> The other changes are not in KDE 3.3 and might want to be backported.
>
>
>
>
>  M  +9 -2      kimageio.cpp
>
>
> --- trunk/KDE/kdelibs/kio/kio/kimageio.cpp #659100:659101
> @@ -51,6 +51,9 @@
>
>  QStringList KImageIO::typeForMime(const QString& mimeType)
>  {
> +    if ( mimeType.isEmpty() )
> +        return QStringList();
> +
>      KService::List services =
> KServiceTypeTrader::self()->query("QImageIOPlugins"); KService::Ptr
> service;
>      foreach(service, services) {
> @@ -70,7 +73,9 @@
>          if ( (service->property("X-KDE-Read").toBool() && mode == Reading)
> || (service->property("X-KDE-Write").toBool() && mode == Writing ) ) {
>
> -            mimeList.append(
> service->property("X-KDE-MimeType").toString() ); +            const
> QString mime = service->property("X-KDE-MimeType").toString(); +           
> if ( !mime.isEmpty() )
> +                mimeList.append( mime );
>          }
>      }
>
> @@ -87,7 +92,6 @@
>               (service->property("X-KDE-Write").toBool() && mode == Writing
> ) ) {
>
>              imagetypes +=
> service->property("X-KDE-ImageFormat").toStringList(); -
>          }
>      }
>      return imagetypes;
> @@ -95,6 +99,9 @@
>
>  bool KImageIO::isSupported( const QString& mimeType, Mode mode )
>  {
> +    if (mimeType.isEmpty() )
> +        return false;
> +
>      KService::List services =
> KServiceTypeTrader::self()->query("QImageIOPlugins"); KService::Ptr
> service;
>      foreach(service, services) {


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