← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde4libs/precise-updates

« back to all changes in this revision

Viewing changes to kio/kio/previewjob.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-06-23 22:35:43 UTC
  • mfrom: (1.14.18)
  • Revision ID: package-import@ubuntu.com-20120623223543-05eqew5wxa89mvve
Tags: 4:4.8.4a-0ubuntu0.1
https://launchpad.net/bugs/1007798
* New upstream release. (LP: #1007798)
* Update symbol files.
* Cherry-pick two commits from the upstream KDE/4.8.x branch so that
  kdelibs works with soprano 2.7.
  - Add Revert_Always_rec-connect_if_forced.diff
  - Add Revert_disconnect_before_re-connecting.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/kio/previewjob.cpp
273
273
    QMap<QString, KService::Ptr> mimeMap;
274
274
    QHash<QString, QHash<QString, KService::Ptr> > protocolMap;
275
275
    for (KService::List::ConstIterator it = plugins.constBegin(); it != plugins.constEnd(); ++it) {
276
 
        const QStringList protocols = (*it)->property("X-KDE-Protocol").toStringList();
 
276
        QStringList protocols = (*it)->property("X-KDE-Protocols").toStringList();
 
277
        const QString p = (*it)->property("X-KDE-Protocol").toString();
 
278
        if (!p.isEmpty()) {
 
279
            protocols.append(p);
 
280
        }
277
281
        foreach (const QString &protocol, protocols) {
278
282
            QStringList mtypes = (*it)->serviceTypes();
279
283
            // Filter out non-mimetype servicetypes
588
592
            supportsProtocol = true;
589
593
        } else if (m_remoteProtocolPlugins.value("KIO").contains(item.mimetype())) {
590
594
            // Assume KIO understands any URL, ThumbCreator slaves who have
591
 
            // X-KDE-Protocol=KIO, will get feed the remote URL directly.
 
595
            // X-KDE-Protocols=KIO will get fed the remote URL directly.
592
596
            supportsProtocol = true;
593
597
        }
594
598