← Back to branch summary

~ubuntu-branches/ubuntu/karmic/psi/karmic

« back to all changes in this revision

Viewing changes to third-party/qca/qca-gnupg/gpgop.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-08-28 18:46:52 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080828184652-iiik12dl91nq7cdi
Tags: 0.12-2
http://bugs.debian.org/494352
Uploading to unstable (Closes: Bug#494352)

Show diffs side-by-side

added added

removed removed

Lines of Context:
third-party/qca/qca-gnupg/gpgop.cpp
411
411
                QByteArray sig;
412
412
                QByteArray inkey;
413
413
                QString export_key_id;
 
414
                QString delete_key_fingerprint;
414
415
 
415
416
                Input() : opt_ascii(false), opt_noagent(false), opt_alwaystrust(false) {}
416
417
        };
446
447
        bool badPassphrase;
447
448
        bool need_submitPassphrase, need_cardOkay;
448
449
        QString diagnosticText;
449
 
        QTimer dtextTimer;
 
450
        SafeTimer dtextTimer;
450
451
 
451
452
#ifdef GPG_PROFILE
452
453
        QTime timer;
690
691
                                        readText = true;
691
692
                                break;
692
693
                        }
 
694
                        case GpgOp::DeleteKey:
 
695
                        {
 
696
                                args += "--batch";
 
697
                                args += "--delete-key";
 
698
                                args += QString("0x") + input.delete_key_fingerprint;
 
699
                                break;
 
700
                        }
693
701
                }
694
702
 
695
703
#ifdef GPG_PROFILE
1196
1204
        {
1197
1205
                if(act)
1198
1206
                {
1199
 
                        delete act;
 
1207
                        releaseAndDeleteLater(this, act);
1200
1208
                        act = 0;
1201
1209
                }
1202
1210
 
1517
1525
        d->act->start();
1518
1526
}
1519
1527
 
 
1528
void GpgOp::doDeleteKey(const QString &key_fingerprint)
 
1529
{
 
1530
        d->make_act(DeleteKey);
 
1531
        d->act->input.delete_key_fingerprint = key_fingerprint;
 
1532
        d->act->start();
 
1533
}
 
1534
 
1520
1535
#ifdef QPIPE_SECURE
1521
1536
void GpgOp::submitPassphrase(const QCA::SecureArray &a)
1522
1537
#else