1 files changed, 25 insertions, 25 deletions

diff --git a/trunk/gpgme/encrypt.c b/trunk/gpgme/encrypt.c
index a972080e..14882398 100644
--- a/trunk/gpgme/encrypt.c
+++ b/trunk/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)