~ubuntu-branches/ubuntu/oneiric/kdenetwork/oneiric-updates

« back to all changes in this revision

Viewing changes to kget/transfer-plugins/metalink/metalink.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac, Philip Muškovac
  • Date: 2011-07-10 12:36:35 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: package-import@ubuntu.com-20110710123635-3db9oyxdswp4sp1e
Tags: 4:4.6.90-0ubuntu1
* New upstream release
 - Bump on kde-sc-dev-latest
 - s/kdebase-runtime-dev/kde-runtime-dev
* Dropped kubuntu_05_samba_sharing.diff <- went upstream
* Added kubuntu_05_make_old_symbols_reappear_and_fix_building.diff
* Refreshed *.install
* Refreshed symbols

[ Philip Muškovac ]
* fix debug package depends on kdebase-runtime-dbg -> kde-runtime-dbg 
  and recommends on kde-workspace-dbg

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
#include "core/filemodel.h"
22
22
#include "core/urlchecker.h"
23
23
#include "core/verifier.h"
 
24
#include "core/signature.h"
24
25
#ifdef HAVE_NEPOMUK
25
26
#include "core/nepomukhandler.h"
26
27
#include <Nepomuk/Variant>
81
82
 
82
83
    setStatus(Job::Stopped, i18n("Downloading Metalink File...."), SmallIcon("document-save"));
83
84
    setTransferChange(Tc_Status, true);
84
 
    Download *download = new Download(m_source, KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName());
 
85
    Download *download = new Download(m_source, QString(KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName()));
85
86
    connect(download, SIGNAL(finishedSuccessfully(KUrl, QByteArray)), SLOT(metalinkInit(KUrl, QByteArray)));
86
87
}
87
88
 
154
155
        connect(dataFactory, SIGNAL(dataSourceFactoryChange(Transfer::ChangesFlags)), this, SLOT(slotDataSourceFactoryChange(Transfer::ChangesFlags)));
155
156
        connect(dataFactory->verifier(), SIGNAL(verified(bool)), this, SLOT(slotVerified(bool)));
156
157
        connect(dataFactory->signature(), SIGNAL(verified(int)), this, SLOT(slotSignatureVerified()));
 
158
        connect(dataFactory, SIGNAL(log(QString,Transfer::LogLevel)), this, SLOT(setLog(QString,Transfer::LogLevel)));
157
159
 
158
160
        //add the DataSources
159
161
        for (int i = 0; i < urlList.size(); ++i)
171
173
        }
172
174
        else
173
175
        {
174
 
            dataFactory->verifier()->model()->addChecksums((*it).verification.hashes);
 
176
            dataFactory->verifier()->addChecksums((*it).verification.hashes);
175
177
            foreach (const KGetMetalink::Pieces &pieces, (*it).verification.pieces) {
176
178
                dataFactory->verifier()->addPartialChecksums(pieces.type, pieces.length, pieces.hashes);
177
179
            }
181
183
            QHash<QString, QString>::const_iterator itEnd = signatures.constEnd();
182
184
            for (it = signatures.constBegin(); it != itEnd; ++it) {
183
185
                if (it.key().toLower() == "pgp") {
184
 
                    dataFactory->signature()->setSignature(*it);
 
186
                    dataFactory->signature()->setAsciiDetatchedSignature(*it);
185
187
                }
186
188
            }
187
189
 
619
621
        m_dataSourceFactory[file->dest()] = file;
620
622
        connect(file->verifier(), SIGNAL(verified(bool)), this, SLOT(slotVerified(bool)));
621
623
        connect(file->signature(), SIGNAL(verified(int)), this, SLOT(slotSignatureVerified()));
 
624
        connect(file, SIGNAL(log(QString,Transfer::LogLevel)), this, SLOT(setLog(QString,Transfer::LogLevel)));
622
625
 
623
626
        //start the DataSourceFactories that were Started when KGet was closed
624
627
        if (file->status() == Job::Running) {