2003-05-18 Marcus Brinkmann <[email protected]>

	In all files, replace the Gpgme* type names with the new gpgme_*
	type names.

doc/
2003-05-18  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Header): Remove Gpgme as namespace prefix.  Add
	_GPGME to namespace prefix.
	* gpgme.texi (Multi Threading): Add note about link order.

gpgme/
2003-05-18  Marcus Brinkmann  <[email protected]>

	* gpgme.h: The following types are renamed.  The old name is kept
	as a deprecated typedef.
	(GpgmeCtx): Rename to gpgme_ctx_t.
	(GpgmeData): Rename to gpgme_data_t.
	(GpgmeRecipients): Rename to gpgme_recipients_t.
	(GpgmeError): Rename to gpgme_error_t.
	(GpgmeDataEncoding): Rename to gpgme_data_encoding_t.
	(GpgmePubKeyAlgo): Rename to gpgme_pubkey_algo_t.
	(GpgmeHashAlgo): Rename to gpgme_hash_algo_t.
	(GpgmeSigStat): Rename to gpgme_sig_stat_t.
	(GpgmeSigMode): Rename to gpgme_sig_mode_t.
	(GpgmeAttr): Rename to gpgme_attr_t.
	(GpgmeValidity): Rename to gpgme_validity_t.
	(GpgmeProtocol): Rename to gpgme_protocol_t.
	(GpgmeStatusCode): Rename to gpgme_status_code_t.
	(GpgmeEngineInfo): Rename to gpgme_engine_info_t.
	(GpgmeSubkey): Rename to gpgme_subkey_t.
	(GpgmeKeySig): Rename to gpgme_keysig_t.
	(GpgmeUserID): Rename to gpgme_user_id_t.
	(GpgmePassphraseCb): Rename to gpgme_passphrase_cb_t.
	(GpgmeProgressCb): Rename to gpgme_progress_cb_t.
	(GpgmeEditCb): Rename to gpgme_edit_cb_t.
	(GpgmeIOCb): Rename to gpgme_io_cb_t.
	(GpgmeRegisterIOCb): Rename to gpgme_register_io_cb_t.
	(GpgmeRemoveIOCb): Rename to gpgme_remove_io_cb_t.
	(GpgmeEventIO): Rename to gpgme_event_io_t.
	(GpgmeEventIOCb): Rename to gpgme_event_io_cb_t.
	(GpgmeIOCbs): Rename to gpgme_io_cbs.
	(gpgme_io_cbs_t): New type.
	(GpgmeDataReadCb): Rename to gpgme_data_read_cb_t.
	(GpgmeDataWriteCb): Rename to gpgme_data_write_cb_t.
	(GpgmeDataSeekCb): Rename to gpgme_data_seek_cb_t.
	(GpgmeDataReleaseCb): Rename to gpgme_data_release_cb_t.
	(GpgmeDataCbs): Rename to gpgme_data_cbs.
	(gpgme_data_cbs_t): New type.
	(GpgmeInvalidUserID): Rename to gpgme_invalid_user_id_t.
	(GpgmeEncryptResult): Rename to gpgme_encrypt_result_t.
	(GpgmeDecryptResult): Rename to gpgme_decrypt_result_t.
	(GpgmeNewSignature): Rename to gpgme_new_signature_t.
	(GpgmeSignResult): Rename to gpgme_sign_result_t.
	(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.
	(GpgmeImportResult): Rename to gpgme_import_result_t.
	(GpgmeGenKeyResult): Rename to gpgme_genkey_result_t.
	(GpgmeKeyListResult): Rename to gpgme_keylist_result_t.
	(GpgmeTrustItem): Rename to gpgme_trust_item_t.
	* gpgme.h (gpgme_deprecated_error_t): New type, swallowing macros
	GPGME_No_Recipients, GPGME_Invalid_Recipient and
	GPGME_No_Passphrase.
	* data.h (struct gpgme_data_s): Rename to struct gpgme_data.
	* context.h (struct gpgme_context_s): Rename to struct
	gpgme_context.
	(struct gpgme_recipients_s): Rename to gpgme_recipients.

1 files changed, 25 insertions, 25 deletions

diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index a972080e..14882398 100644
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -37,7 +37,7 @@ typedef struct
   /* A pointer to the next pointer of the last invalid recipient in
      the list.  This makes appending new invalid recipients painless
      while preserving the order.  */
-  GpgmeInvalidUserID *lastp;
+  gpgme_invalid_user_id_t *lastp;
 } *op_data_t;
 
 
@@ -45,22 +45,22 @@ static void
 release_op_data (void *hook)
 {
   op_data_t opd = (op_data_t) hook;
-  GpgmeInvalidUserID invalid_recipient = opd->result.invalid_recipients;
+  gpgme_invalid_user_id_t invalid_recipient = opd->result.invalid_recipients;
 
   while (invalid_recipient)
     {
-      GpgmeInvalidUserID next = invalid_recipient->next;
+      gpgme_invalid_user_id_t next = invalid_recipient->next;
       free (invalid_recipient->id);
       invalid_recipient = next;
     }
 }
 
 
-GpgmeEncryptResult
-gpgme_op_encrypt_result (GpgmeCtx ctx)
+gpgme_encrypt_result_t
+gpgme_op_encrypt_result (gpgme_ctx_t ctx)
 {
   op_data_t opd;
-  GpgmeError err;
+  gpgme_error_t err;
 
   err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd, -1, NULL);
   if (err || !opd)
@@ -70,11 +70,11 @@ gpgme_op_encrypt_result (GpgmeCtx ctx)
 }
 
 
-GpgmeError
-_gpgme_encrypt_status_handler (void *priv, GpgmeStatusCode code, char *args)
+gpgme_error_t
+_gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  GpgmeCtx ctx = (GpgmeCtx) priv;
-  GpgmeError err;
+  gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
+  gpgme_error_t err;
   op_data_t opd;
 
   err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd,
@@ -108,18 +108,18 @@ _gpgme_encrypt_status_handler (void *priv, GpgmeStatusCode code, char *args)
 }
 
 
-GpgmeError
-_gpgme_encrypt_sym_status_handler (void *priv, GpgmeStatusCode code,
+gpgme_error_t
+_gpgme_encrypt_sym_status_handler (void *priv, gpgme_status_code_t code,
 				   char *args)
 {
   return _gpgme_passphrase_status_handler (priv, code, args);
 }
 
 
-GpgmeError
-_gpgme_op_encrypt_init_result (GpgmeCtx ctx)
+gpgme_error_t
+_gpgme_op_encrypt_init_result (gpgme_ctx_t ctx)
 {
-  GpgmeError err;
+  gpgme_error_t err;
   op_data_t opd;
 
   err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd,
@@ -131,11 +131,11 @@ _gpgme_op_encrypt_init_result (GpgmeCtx ctx)
 }
 
 
-static GpgmeError
-encrypt_start (GpgmeCtx ctx, int synchronous, GpgmeRecipients recp,
-	       GpgmeData plain, GpgmeData cipher)
+static gpgme_error_t
+encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp,
+	       gpgme_data_t plain, gpgme_data_t cipher)
 {
-  GpgmeError err;
+  gpgme_error_t err;
   int symmetric = 0;
 
   err = _gpgme_op_reset (ctx, synchronous);
@@ -177,9 +177,9 @@ encrypt_start (GpgmeCtx ctx, int synchronous, GpgmeRecipients recp,
 }
 
 
-GpgmeError
-gpgme_op_encrypt_start (GpgmeCtx ctx, GpgmeRecipients recp, GpgmeData plain,
-			GpgmeData cipher)
+gpgme_error_t
+gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_recipients_t recp, gpgme_data_t plain,
+			gpgme_data_t cipher)
 {
   return encrypt_start (ctx, 0, recp, plain, cipher);
 }
@@ -187,9 +187,9 @@ gpgme_op_encrypt_start (GpgmeCtx ctx, GpgmeRecipients recp, GpgmeData plain,
 
 /* Encrypt plaintext PLAIN within CTX for the recipients RECP and
    store the resulting ciphertext in CIPHER.  */
-GpgmeError
-gpgme_op_encrypt (GpgmeCtx ctx, GpgmeRecipients recp,
-		  GpgmeData plain, GpgmeData cipher)
+gpgme_error_t
+gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_recipients_t recp,
+		  gpgme_data_t plain, gpgme_data_t cipher)
 {
   int err = encrypt_start (ctx, 1, recp, plain, cipher);
   if (!err)