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 /libtdenetwork/libgpgme-copy/gpgme | |
| 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 'libtdenetwork/libgpgme-copy/gpgme')
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/ChangeLog | 8 | ||||
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c | 4 | ||||
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/gpgme.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog index c9665e2a2..85fd28d30 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog +++ b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog @@ -1596,7 +1596,7 @@ (GpgmeSigNotation): Rename to gpgme_sig_notation_t. (GpgmeSignature): Rename to gpgme_signature_t. (GpgmeVerifyResult): Rename to gpgme_verify_result_t. - (GpgmeImportStatus): Rename to gpgme_import_status_t. + (GpgmeImporttqStatus): Rename to gpgme_import_status_t. (GpgmeImportResult): Rename to gpgme_import_result_t. (GpgmeGenKeyResult): Rename to gpgme_genkey_result_t. (GpgmeKeyListResult): Rename to gpgme_keylist_result_t. @@ -1901,7 +1901,7 @@ GPGME_Unsupported_Algorithm, GPGME_Sig_Expired, GPGME_Bad_Signature, GPGME_No_Public_Key added as new error codes. (struct _gpgme_import_status): New structure. - (GpgmeImportStatus): New type. + (GpgmeImporttqStatus): New type. (struct _gpgme_op_import_result): New structure. (GpgmeImportResult): New type. (gpgme_op_import_result): New function. @@ -2030,7 +2030,7 @@ (do_subsystem_inits): Do not call _gpgme_key_cache_init. * mkstatus: Strip trailing comma. - * gpgme.h (GpgmeStatus): Pretty print. + * gpgme.h (GpgmetqStatus): Pretty print. * gpgme.h (GpgmeError): Rename GPGME_No_Passphrase to GPGME_Bad_Passphrase. @@ -5218,7 +5218,7 @@ * types.h: Add ulong typedef. * rungpg.c (do_reaping,_gpgme_gpg_housecleaning): New. - (_gpgme_gpg_release): Reap children. + (_gpgme_gpg_release): Reap tqchildren. * io.h, posix-io.c (_gpgme_io_kill): New. * w32-io.c (_gpgme_io_kill): New (dummy). diff --git a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c index 1d536440d..7ad8dc6f2 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c +++ b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c @@ -202,9 +202,9 @@ map_assuan_error (gpg_error_t err) case ASSUAN_Inquire_Unknown: case ASSUAN_Inquire_Error: case ASSUAN_Invalid_Option: - case ASSUAN_Unexpected_Status: + case ASSUAN_Unexpected_tqStatus: case ASSUAN_Unexpected_Data: - case ASSUAN_Invalid_Status: + case ASSUAN_Invalid_tqStatus: return gpg_error (GPG_ERR_ASSUAN); case ASSUAN_Invalid_Response: diff --git a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h index e2d53c751..f6f31ae2a 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h +++ b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h @@ -1694,7 +1694,7 @@ typedef gpgme_encrypt_result_t GpgmeEncryptResult _GPGME_DEPRECATED; typedef gpgme_sig_notation_t GpgmeSigNotation _GPGME_DEPRECATED; typedef gpgme_signature_t GpgmeSignature _GPGME_DEPRECATED; typedef gpgme_verify_result_t GpgmeVerifyResult _GPGME_DEPRECATED; -typedef gpgme_import_status_t GpgmeImporStatus _GPGME_DEPRECATED; +typedef gpgme_import_status_t GpgmeImportqStatus _GPGME_DEPRECATED; typedef gpgme_import_result_t GpgmeImportResult _GPGME_DEPRECATED; typedef gpgme_genkey_result_t GpgmeGenKeyResult _GPGME_DEPRECATED; typedef gpgme_trust_item_t GpgmeTrustItem _GPGME_DEPRECATED; |