~ubuntu-branches/ubuntu/oneiric/kdepim/oneiric-updates

« back to all changes in this revision

Viewing changes to libkleo/backends/chiasmus/obtainkeysjob.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-06-28 19:33:24 UTC
  • mfrom: (0.2.13) (0.1.13 sid)
  • Revision ID: package-import@ubuntu.com-20110628193324-8yvjs8sdv9rdoo6c
Tags: 4:4.7.0-0ubuntu1
* New upstream release
  - update install files
  - add missing kdepim-doc package to control file
  - Fix Vcs lines
  - kontact breaks/replaces korganizer << 4:4.6.80
  - tighten the dependency of kdepim-dev on libkdepim4 to fix lintian error

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
 
86
86
void Kleo::ObtainKeysJob::slotPerform( bool async ) {
87
87
  if ( mCanceled && !mError )
88
 
    mError = GpgME::Error( gpg_error( GPG_ERR_CANCELED ) );
 
88
    mError = GpgME::Error::fromCode( GPG_ERR_CANCELED );
89
89
  if ( int(mIndex) >= mKeyPaths.size() || mError ) {
90
90
    emit done();
91
91
    emit SpecialJob::result( mError, QVariant( mResult ) );