diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /certmanager/lib/cryptplug.cpp | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'certmanager/lib/cryptplug.cpp')
-rw-r--r-- | certmanager/lib/cryptplug.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a914514..53865edf4 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status ) // gpgme 0.3 version below, too! static void obtain_signature_information( gpgme_ctx_t ctx, - gpgme_sig_stat_t & overallStatus, + gpgme_sig_stat_t & overalltqStatus, struct CryptPlug::SignatureMetaData* sigmeta, char** attrOrder, const char* unknownAttrsHandling, @@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx, storeNewCharPtr( &this_info.status_text, sig_status ); } sigmeta->extended_info_count = sig_idx; - overallStatus = intersect_stati( result->signatures ); - sigmeta->status_code = overallStatus; - storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) ); + overalltqStatus = intersect_stati( result->signatures ); + sigmeta->status_code = overalltqStatus; + storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) ); if ( signatureFound ) - *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE ); + *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE ); } bool CryptPlug::checkMessageSignature( char** cleartext, |