~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-security

« back to all changes in this revision

Viewing changes to kio/kio/accessmanagerreply_p.cpp

  • Committer: Package Import Robot
  • Author(s): Michał Zając, Michał Zając, Jonathan Riddell
  • Date: 2011-02-27 14:10:59 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: package-import@ubuntu.com-20110227141059-asgzcw48ao08rvkp
Tags: 4:4.6.1-0ubuntu1
[ Michał Zając ]
* New upstream release
* Refreshed kubuntu_06_user_disk_mounting.diff
* Refreshed kubuntu_77_ksambashare.diff
* Refreshed *.install files

[ Jonathan Riddell ]
* Add back kubuntu_77_no_kbookmark_write_error.diff workaround for LP:
  #627815

Show diffs side-by-side

added added

removed removed

Lines of Context:
293
293
    const QUrl redirectUrl = attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
294
294
    if (redirectUrl.isValid())
295
295
        readHttpResponseHeaders(m_kioJob);
 
296
    else {
 
297
        setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
 
298
        if (errcode)
 
299
            emit error(error());
 
300
    }
296
301
 
297
 
    setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
298
 
    if (errcode)
299
 
        emit error(error());
300
 
    
301
302
    emit finished();
302
303
}
303
304