diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:34:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:34:45 -0600 |
| commit | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch) | |
| tree | 4138783f7dad757fc5fbfaa8d66a355288d3125e /libtdenetwork/libgpgme-copy | |
| parent | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff) | |
| download | tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'libtdenetwork/libgpgme-copy')
| -rw-r--r-- | libtdenetwork/libgpgme-copy/assuan/assuan.h | 4 | ||||
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c | 4 | ||||
| -rw-r--r-- | libtdenetwork/libgpgme-copy/gpgme/gpgme.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan.h b/libtdenetwork/libgpgme-copy/assuan/assuan.h index 8d0a3960d..cdf0445ab 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan.h +++ b/libtdenetwork/libgpgme-copy/assuan/assuan.h @@ -283,9 +283,9 @@ extern "C" #define ASSUAN_Inquire_Error 121 #define ASSUAN_Invalid_Option 122 #define ASSUAN_Invalid_Index 123 -#define ASSUAN_Unexpected_tqStatus 124 +#define ASSUAN_Unexpected_Status 124 #define ASSUAN_Unexpected_Data 125 -#define ASSUAN_Invalid_tqStatus 126 +#define ASSUAN_Invalid_Status 126 #define ASSUAN_Locale_Problem 127 #endif #define ASSUAN_Not_Confirmed 128 diff --git a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog index 85fd28d30..cb2393938 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. - (GpgmeImporttqStatus): Rename to gpgme_import_status_t. + (GpgmeImportStatus): 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. - (GpgmeImporttqStatus): New type. + (GpgmeImportStatus): 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 (GpgmetqStatus): Pretty print. + * gpgme.h (GpgmeStatus): Pretty print. * gpgme.h (GpgmeError): Rename GPGME_No_Passphrase to GPGME_Bad_Passphrase. diff --git a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c index 7ad8dc6f2..1d536440d 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_tqStatus: + case ASSUAN_Unexpected_Status: case ASSUAN_Unexpected_Data: - case ASSUAN_Invalid_tqStatus: + case ASSUAN_Invalid_Status: 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 f6f31ae2a..e2d53c751 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 GpgmeImportqStatus _GPGME_DEPRECATED; +typedef gpgme_import_status_t GpgmeImporStatus _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; |