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.

27 files changed, 201 insertions, 206 deletions

diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 2cb7f726..fb8a079f 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -31,7 +31,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -40,7 +40,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -56,7 +56,7 @@ print_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 {
   /* Cleanup by looking at *hd.  */
@@ -91,10 +91,10 @@ make_filename (const char *fname)
 
 
 static void
-check_verify_result (GpgmeVerifyResult result, int summary, char *fpr,
-		     GpgmeError status)
+check_verify_result (gpgme_verify_result_t result, int summary, char *fpr,
+		     gpgme_error_t status)
 {
-  GpgmeSignature sig;
+  gpgme_signature_t sig;
 
   sig = result->signatures;
   if (!sig || sig->next)
@@ -151,11 +151,11 @@ check_verify_result (GpgmeVerifyResult result, int summary, char *fpr,
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeDecryptResult decrypt_result;
-  GpgmeVerifyResult verify_result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_decrypt_result_t decrypt_result;
+  gpgme_verify_result_t verify_result;
   const char *cipher_2_asc = make_filename ("cipher-2.asc");
   char *agent_info;
 
diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index 6aaacabc..b674653a 100644
--- a/tests/gpg/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -39,7 +39,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -55,7 +55,7 @@ print_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 {
   /* Cleanup by looking at *hd.  */
@@ -92,10 +92,10 @@ make_filename (const char *fname)
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeDecryptResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_decrypt_result_t result;
   const char *cipher_1_asc = make_filename ("cipher-1.asc");
   char *agent_info;
 
diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index 89638327..a90ebff6 100644
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -28,13 +28,13 @@
 #include <gpgme.h>
 
 struct passphrase_cb_info_s {
-    GpgmeCtx c;
+    gpgme_ctx_t c;
     int did_it;
 };
 
 
 #define fail_if_err(a) do { if(a) { int my_errno = errno; \
-            fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+            fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                  __FILE__, __LINE__, gpgme_strerror(a));   \
             if ((a) == GPGME_File_Error)                       \
                    fprintf (stderr, "\terrno=`%s'\n", strerror (my_errno)); \
@@ -42,7 +42,7 @@ struct passphrase_cb_info_s {
                              } while(0)
 
 static void
-flush_data (GpgmeData dh)
+flush_data (gpgme_data_t dh)
 {
   char buf[100];
   int ret;
@@ -57,7 +57,7 @@ flush_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc,
 	       void **r_hd, const char **result)
 {
@@ -73,10 +73,10 @@ passphrase_cb (void *opaque, const char *desc,
 }
 
 
-GpgmeError
-edit_fnc (void *opaque, GpgmeStatusCode status, const char *args, const char **result)
+gpgme_error_t
+edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, const char **result)
 {
-  GpgmeData out = (GpgmeData) opaque;
+  gpgme_data_t out = (gpgme_data_t) opaque;
 
   fputs ("[-- Response --]\n", stdout);
   flush_data (out); 
@@ -120,10 +120,10 @@ edit_fnc (void *opaque, GpgmeStatusCode status, const char *args, const char **r
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData out = NULL;
-  GpgmeKey key = NULL;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t out = NULL;
+  gpgme_key_t key = NULL;
   struct passphrase_cb_info_s info;
   const char *pattern = "Alpha";
   char *p;
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index 3093afb1..d92d6ff8 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -54,7 +54,7 @@ print_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 {
   /* Cleanup by looking at *hd.  */
@@ -67,7 +67,7 @@ passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 
 
 static void
-check_result (GpgmeSignResult result, GpgmeSigMode type)
+check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
 {
   if (result->invalid_signers)
     {
@@ -116,12 +116,12 @@ check_result (GpgmeSignResult result, GpgmeSigMode type)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeRecipients rset;
-  GpgmeEncryptResult result;
-  GpgmeSignResult sign_result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_recipients_t rset;
+  gpgme_encrypt_result_t result;
+  gpgme_sign_result_t sign_result;
   char *agent_info;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 520005ca..7ebd397d 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -27,13 +27,13 @@
 #include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                                 __FILE__, __LINE__, gpgme_strerror(a));   \
                                 exit (1); }                               \
                              } while(0)
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
   char buf[100];
   int ret;
@@ -47,7 +47,7 @@ print_data (GpgmeData dh)
     fail_if_err (GPGME_File_Error);
 }
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc,
 	       void **r_hd, const char **result)
 {
@@ -66,9 +66,9 @@ passphrase_cb (void *opaque, const char *desc,
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData plain, cipher;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t plain, cipher;
   const char *text = "Hallo Leute\n";
   char *text2;
   char *p;
@@ -101,8 +101,7 @@ main (int argc, char **argv)
       print_data (cipher);
       fputs ("End Result.\n", stdout);
 
-      err = gpgme_data_rewind (cipher);
-      fail_if_err (err);
+      gpgme_data_seek (cipher, 0, SEEK_SET);
 
       gpgme_data_release (plain);
       err = gpgme_data_new (&plain);
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index d5359b9a..1bd7bbf6 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -57,11 +57,11 @@ print_data (GpgmeData dh)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeRecipients rset;
-  GpgmeEncryptResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_recipients_t rset;
+  gpgme_encrypt_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index b168ef89..66dce7fc 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -28,13 +28,13 @@
 #include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                                 __FILE__, __LINE__, gpgme_strerror(a));   \
                                 exit (1); }                               \
                              } while(0)
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
   char buf[100];
   int ret;
@@ -54,7 +54,7 @@ print_data (GpgmeData dh)
 struct op_result
 {
   int done;
-  GpgmeError err;
+  gpgme_error_t err;
 };
 
 struct op_result op_result;
@@ -63,15 +63,15 @@ struct one_fd
 {
   int fd;
   int dir;
-  GpgmeIOCb fnc;
+  gpgme_io_cb_t fnc;
   void *fnc_data;
 };
 
 #define FDLIST_MAX 32
 struct one_fd fdlist[FDLIST_MAX];
 
-GpgmeError
-add_io_cb (void *data, int fd, int dir, GpgmeIOCb fnc, void *fnc_data,
+gpgme_error_t
+add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
 	   void **r_tag)
 {
   struct one_fd *fds = data;
@@ -103,14 +103,14 @@ remove_io_cb (void *tag)
 }
 
 void
-io_event (void *data, GpgmeEventIO type, void *type_data)
+io_event (void *data, gpgme_event_io_t type, void *type_data)
 {
   struct op_result *result = data;
 
   if (type == GPGME_EVENT_DONE)
     {
       result->done = 1;
-      result->err = * (GpgmeError *) type_data;
+      result->err = * (gpgme_error_t *) type_data;
     }
 }
 
@@ -166,7 +166,7 @@ my_wait (void)
   return 0;
 }
 
-struct GpgmeIOCbs io_cbs =
+struct gpgme_io_cbs io_cbs =
   {
     add_io_cb,
     fdlist,
@@ -178,10 +178,10 @@ struct GpgmeIOCbs io_cbs =
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeRecipients rset;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_recipients_t rset;
   int i;
 
   for (i = 0; i < FDLIST_MAX; i++)
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index dbcdd884..520a3d33 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -27,14 +27,14 @@
 #include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                                 __FILE__, __LINE__, gpgme_strerror(a));   \
                                 exit (1); }                               \
                              } while(0)
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
   char buf[100];
   int ret;
@@ -51,10 +51,10 @@ print_data (GpgmeData dh)
 int 
 main (int argc, char **argv )
 {
-    GpgmeCtx ctx;
-    GpgmeError err;
-    GpgmeData  out;
-    GpgmeRecipients rset;
+    gpgme_ctx_t ctx;
+    gpgme_error_t err;
+    gpgme_data_t  out;
+    gpgme_recipients_t rset;
 
   do {
     err = gpgme_new (&ctx);
diff --git a/tests/gpg/t-genkey.c b/tests/gpg/t-genkey.c
index 3e13f02a..40aa3036 100644
--- a/tests/gpg/t-genkey.c
+++ b/tests/gpg/t-genkey.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -62,8 +62,8 @@ progress (void *self, const char *what, int type, int current, int total)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
   const char *parms = "<GnupgKeyParms format=\"internal\">\n"
     "Key-Type: DSA\n"
     "Key-Length: 1024\n"
@@ -75,7 +75,7 @@ main (int argc, char **argv)
     "Expire-Date: 0\n"
     "Passphrase: abc\n"
     "</GnupgKeyParms>\n";
-  GpgmeGenKeyResult result;
+  gpgme_genkey_result_t result;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index bce9fd30..3f500a2f 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -31,7 +31,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -58,7 +58,7 @@ mk_fname (const char *fname)
 
 
 void
-check_result (GpgmeImportResult result, char *fpr, int secret)
+check_result (gpgme_import_result_t result, char *fpr, int secret)
 {
   if (result->considered != 1)
     {
@@ -183,10 +183,10 @@ check_result (GpgmeImportResult result, char *fpr, int secret)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in;
-  GpgmeImportResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in;
+  gpgme_import_result_t result;
   const char *pubkey_1_asc = mk_fname ("pubkey-1.asc");
   const char *seckey_1_asc = mk_fname ("seckey-1.asc");
 
diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index 66b26a3c..46260bfb 100644
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -49,7 +49,7 @@ struct
     char *email;
     struct
     {
-      GpgmePubKeyAlgo algo;
+      gpgme_pubkey_algo_t algo;
       char *keyid;
       char *name;
       char *comment;
@@ -77,10 +77,10 @@ keys[] =
 int 
 main (int argc, char **argv)
 {
-  GpgmeError err;
-  GpgmeCtx ctx;
-  GpgmeKey key;
-  GpgmeKeyListResult result;
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  gpgme_key_t key;
+  gpgme_keylist_result_t result;
   int mode;
   int i = 0;
 
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index 7084e378..45e46a0f 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -118,10 +118,10 @@ keys[] =
 int 
 main (int argc, char **argv)
 {
-  GpgmeError err;
-  GpgmeCtx ctx;
-  GpgmeKey key;
-  GpgmeKeyListResult result;
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  gpgme_key_t key;
+  gpgme_keylist_result_t result;
   int i = 0;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index 94747a8e..e2252150 100644
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -54,7 +54,7 @@ print_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 {
   /* Cleanup by looking at *hd.  */
@@ -67,7 +67,7 @@ passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 
 
 static void
-check_result (GpgmeSignResult result, GpgmeSigMode type)
+check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
 {
   if (result->invalid_signers)
     {
@@ -116,10 +116,10 @@ check_result (GpgmeSignResult result, GpgmeSigMode type)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeSignResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_sign_result_t result;
   char *agent_info;
 
   err = gpgme_new (&ctx);
@@ -146,7 +146,7 @@ main (int argc, char **argv)
   gpgme_data_release (out);
     
   /* Now a detached signature.  */ 
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
   err = gpgme_data_new (&out);
   fail_if_err (err);
   err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH);
@@ -157,7 +157,7 @@ main (int argc, char **argv)
   gpgme_data_release (out);
 
   /* And finally a cleartext signature.  */
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
   err = gpgme_data_new (&out);
   fail_if_err (err);
   err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_CLEAR);
diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index de492b4f..512da59f 100644
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -1,4 +1,4 @@
-/* t-signers.c  - Regression tests for the Gpgme multiple signers interface.
+/* t-signers.c - Regression tests for the multiple signers interface.
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2003 g10 Code GmbH
 
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -54,7 +54,7 @@ print_data (GpgmeData dh)
 }
 
 
-static GpgmeError
+static gpgme_error_t
 passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 {
   /* Cleanup by looking at *hd.  */
@@ -67,9 +67,9 @@ passphrase_cb (void *opaque, const char *desc, void **hd, const char **result)
 
 
 static void
-check_result (GpgmeSignResult result, GpgmeSigMode type)
+check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
 {
-  GpgmeNewSignature signature;
+  gpgme_new_signature_t signature;
 
   if (result->invalid_signers)
     {
@@ -127,11 +127,11 @@ check_result (GpgmeSignResult result, GpgmeSigMode type)
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeKey key[2];
-  GpgmeSignResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_key_t key[2];
+  gpgme_sign_result_t result;
   char *agent_info;
 
   err = gpgme_new (&ctx);
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
   gpgme_data_release (out);
   
   /* Now a detached signature.  */
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
   err = gpgme_data_new (&out);
   fail_if_err (err);
   err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH);
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
   gpgme_data_release (out);
     
   /* And finally a cleartext signature.  */
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
   err = gpgme_data_new (&out);
   fail_if_err (err);
   err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_CLEAR);
@@ -192,7 +192,7 @@ main (int argc, char *argv[])
   check_result (result, GPGME_SIG_MODE_CLEAR);
   print_data (out);  
   gpgme_data_release (out);
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
       
   gpgme_data_release (in);
   gpgme_release (ctx);
diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c
index 874ac08a..cc4bbf3d 100644
--- a/tests/gpg/t-trustlist.c
+++ b/tests/gpg/t-trustlist.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -41,9 +41,9 @@
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeTrustItem item;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_trust_item_t item;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 28b43046..df0c9dfd 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -82,10 +82,10 @@ static const char test_sig2[] =
 
 
 static void
-check_result (GpgmeVerifyResult result, int summary, char *fpr,
-	      GpgmeError status, int notation)
+check_result (gpgme_verify_result_t result, int summary, char *fpr,
+	      gpgme_error_t status, int notation)
 {
-  GpgmeSignature sig;
+  gpgme_signature_t sig;
 
   sig = result->signatures;
   if (!sig || sig->next)
@@ -157,10 +157,10 @@ check_result (GpgmeVerifyResult result, int summary, char *fpr,
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData sig, text;
-  GpgmeVerifyResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t sig, text;
+  gpgme_verify_result_t result;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
   gpgme_data_release (text);
   err = gpgme_data_new_from_mem (&text, test_text1f, strlen (test_text1f), 0);
   fail_if_err (err);
-  gpgme_data_rewind (sig);
+  gpgme_data_seek (sig, 0, SEEK_SET);
   err = gpgme_op_verify (ctx, sig, text, NULL);
   fail_if_err (err);
   result = gpgme_op_verify_result (ctx);
diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 499d82e3..f3dc976d 100644
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -40,7 +40,7 @@ static const char test_cip1[] =
 "-----END CMS OBJECT-----\n";
 
 #define fail_if_err(a) do { if(a) { int my_errno = errno; \
-            fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+            fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                  __FILE__, __LINE__, gpgme_strerror(a));   \
             if ((a) == GPGME_File_Error)                       \
                    fprintf (stderr, "\terrno=`%s'\n", strerror (my_errno)); \
@@ -48,7 +48,7 @@ static const char test_cip1[] =
                              } while(0)
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -67,10 +67,10 @@ print_data (GpgmeData dh)
 int 
 main (int argc, char *argv[])
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeDecryptResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_decrypt_result_t result;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 0783a9c6..1daa7720 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -57,11 +57,11 @@ print_data (GpgmeData dh)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeRecipients rset;
-  GpgmeEncryptResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_recipients_t rset;
+  gpgme_encrypt_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index dd2ac548..b83c060d 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -27,13 +27,13 @@
 #include <gpgme.h>
 
 #define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
                                 __FILE__, __LINE__, gpgme_strerror(a));   \
                                 exit (1); }                               \
                              } while(0)
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
   char buf[100];
   int ret;
@@ -51,10 +51,10 @@ print_data (GpgmeData dh)
 int 
 main (int argc, char **argv )
 {
-    GpgmeCtx ctx;
-    GpgmeError err;
-    GpgmeData  out;
-    GpgmeRecipients rset;
+    gpgme_ctx_t ctx;
+    gpgme_error_t err;
+    gpgme_data_t  out;
+    gpgme_recipients_t rset;
 
   do {
     err = gpgme_new (&ctx);
diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c
index a7530bae..d5df2c61 100644
--- a/tests/gpgsm/t-genkey.c
+++ b/tests/gpgsm/t-genkey.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -39,7 +39,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -81,16 +81,16 @@ progress (void *self, const char *what, int type, int current, int total)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
   const char *parms = "<GnupgKeyParms format=\"internal\">\n"
     "Key-Type: RSA\n"
     "Key-Length: 1024\n"
     "Name-DN: C=de,O=g10 code,OU=Testlab,CN=Joe 2 Tester\n"
     "Name-Email: [email protected]\n"
     "</GnupgKeyParms>\n";
-  GpgmeGenKeyResult result;
-  GpgmeData certreq;
+  gpgme_genkey_result_t result;
+  gpgme_data_t certreq;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c
index 219ce95b..2b50e10e 100644
--- a/tests/gpgsm/t-import.c
+++ b/tests/gpgsm/t-import.c
@@ -31,7 +31,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -62,7 +62,7 @@ make_filename (const char *fname)
 
 
 void
-check_result (GpgmeImportResult result, char *fpr, int total)
+check_result (gpgme_import_result_t result, char *fpr, int total)
 {
   if (result->considered != total)
     {
@@ -154,10 +154,10 @@ check_result (GpgmeImportResult result, char *fpr, int total)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in;
-  GpgmeImportResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in;
+  gpgme_import_result_t result;
   const char *cert_1 = make_filename ("cert_dfn_pca01.der");
   const char *cert_2 = make_filename ("cert_dfn_pca15.der");
 
diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 704776f9..215f1e44 100644
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -76,10 +76,10 @@ keys[] =
 int 
 main (int argc, char **argv)
 {
-  GpgmeError err;
-  GpgmeCtx ctx;
-  GpgmeKey key;
-  GpgmeKeyListResult result;
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  gpgme_key_t key;
+  gpgme_keylist_result_t result;
   int i = 0;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c
index a9af38fb..3c557cfa 100644
--- a/tests/gpgsm/t-sign.c
+++ b/tests/gpgsm/t-sign.c
@@ -29,7 +29,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -38,7 +38,7 @@
 
 
 static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
 {
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
@@ -55,7 +55,7 @@ print_data (GpgmeData dh)
 
 
 static void
-check_result (GpgmeSignResult result, GpgmeSigMode type)
+check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
 {
   if (result->invalid_signers)
     {
@@ -104,10 +104,10 @@ check_result (GpgmeSignResult result, GpgmeSigMode type)
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData in, out;
-  GpgmeSignResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t in, out;
+  gpgme_sign_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
   fail_if_err (err);
@@ -133,7 +133,7 @@ main (int argc, char **argv)
   gpgme_data_release (out);
     
   /* Now a detached signature.  */ 
-  gpgme_data_rewind (in);
+  gpgme_data_seek (in, 0, SEEK_SET);
   err = gpgme_data_new (&out);
   fail_if_err (err);
   err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH);
diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index 48e0ce96..de36073b 100644
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -30,7 +30,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -54,10 +54,10 @@ static const char test_sig1[] =
 
 
 static void
-check_result (GpgmeVerifyResult result, int summary, char *fpr,
-	      GpgmeError status, GpgmeValidity validity)
+check_result (gpgme_verify_result_t result, int summary, char *fpr,
+	      gpgme_error_t status, gpgme_validity_t validity)
 {
-  GpgmeSignature sig;
+  gpgme_signature_t sig;
 
   sig = result->signatures;
   if (!sig || sig->next)
@@ -114,10 +114,10 @@ check_result (GpgmeVerifyResult result, int summary, char *fpr,
 int 
 main (int argc, char **argv)
 {
-  GpgmeCtx ctx;
-  GpgmeError err;
-  GpgmeData sig, text;
-  GpgmeVerifyResult result;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t sig, text;
+  gpgme_verify_result_t result;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -139,7 +139,7 @@ main (int argc, char **argv)
   gpgme_data_release (text);
   err = gpgme_data_new_from_mem (&text, test_text1f, strlen (test_text1f), 0);
   fail_if_err (err);
-  gpgme_data_rewind (sig);
+  gpgme_data_seek (sig, 0, SEEK_SET);
   err = gpgme_op_verify (ctx, sig, text, NULL);
   fail_if_err (err);
   result = gpgme_op_verify_result (ctx);
diff --git a/tests/t-data.c b/tests/t-data.c
index 3135dbdc..d2355965 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -1,4 +1,4 @@
-/* t-data - Regression tests for the GpgmeData abstraction.
+/* t-data - Regression tests for the gpgme_data_t abstraction.
  *      Copyright (C) 2001 g10 Code GmbH
  *
  * This file is part of GPGME.
@@ -26,11 +26,11 @@
 
 #include <gpgme.h>
 
-#define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: (%i) GpgmeError " \
-                                "%s\n", __FILE__, __LINE__, round,        \
-                                gpgme_strerror(a));                       \
-                                exit (1); }                               \
+#define fail_if_err(a) do { if(a) {                                          \
+                               fprintf (stderr, "%s:%d: (%i) gpgme_error_t " \
+                                "%s\n", __FILE__, __LINE__, round,           \
+                                gpgme_strerror(a));                          \
+                                exit (1); }                                  \
                              } while(0)
 
 static char *
@@ -104,7 +104,7 @@ read_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
 }
 
 void
-read_once_test (round_t round, GpgmeData data)
+read_once_test (round_t round, gpgme_data_t data)
 {
   char buffer[1024];
   size_t read;
@@ -128,9 +128,8 @@ read_once_test (round_t round, GpgmeData data)
 }
 
 void
-read_test (round_t round, GpgmeData data)
+read_test (round_t round, gpgme_data_t data)
 {
-  GpgmeError err;
   char buffer[1024];
   size_t read;
 
@@ -147,15 +146,13 @@ read_test (round_t round, GpgmeData data)
     }
 
   read_once_test (round, data);
-  err = gpgme_data_rewind (data);
-  fail_if_err (err);
+  gpgme_data_seek (data, 0, SEEK_SET);
   read_once_test (round, data);
 }
 
 void
-write_test (round_t round, GpgmeData data)
+write_test (round_t round, gpgme_data_t data)
 {
-  GpgmeError err;
   char buffer[1024];
   size_t amt;
 
@@ -163,8 +160,7 @@ write_test (round_t round, GpgmeData data)
   if (amt != strlen (text))
     fail_if_err (GPGME_File_Error);
 
-  err = gpgme_data_rewind (data);
-  fail_if_err (err);
+  gpgme_data_seek (data, 0, SEEK_SET);
 
   if (round == TEST_INOUT_NONE)
     read_once_test (round, data);
@@ -196,8 +192,8 @@ main (int argc, char **argv)
   const char *text_filename = make_filename ("t-data-1.txt");
   const char *longer_text_filename = make_filename ("t-data-2.txt");
   const char *missing_filename = "this-file-surely-does-not-exist";
-  GpgmeError err = GPGME_No_Error;
-  GpgmeData data;
+  gpgme_error_t err = GPGME_No_Error;
+  gpgme_data_t data;
 
   while (++round)
     {
diff --git a/tests/t-engine-info.c b/tests/t-engine-info.c
index ef69b1f5..2705b48b 100644
--- a/tests/t-engine-info.c
+++ b/tests/t-engine-info.c
@@ -33,7 +33,7 @@
     {								\
       if (err)							\
         {							\
-          fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
                    __FILE__, __LINE__, gpgme_strerror (err));   \
           exit (1);						\
         }							\
@@ -42,7 +42,7 @@
 
 
 void
-check_engine_info (GpgmeEngineInfo info, GpgmeProtocol protocol,
+check_engine_info (gpgme_engine_info_t info, gpgme_protocol_t protocol,
 		   const char *file_name, const char *req_version)
 {
   if (info->protocol != protocol)
@@ -69,8 +69,8 @@ check_engine_info (GpgmeEngineInfo info, GpgmeProtocol protocol,
 int 
 main (int argc, char **argv )
 {
-  GpgmeEngineInfo info;
-  GpgmeError err;
+  gpgme_engine_info_t info;
+  gpgme_error_t err;
 
   err = gpgme_get_engine_info (&info);
   fail_if_err (err);
diff --git a/tests/t-version.c b/tests/t-version.c
index 1bdeb461..04cb1743 100644
--- a/tests/t-version.c
+++ b/tests/t-version.c
@@ -29,7 +29,7 @@
 static const char version[] = VERSION;
 
 int 
-main (int argc, char **argv )
+main (int argc, char **argv)
 {
   const char *null_result;
   const char *current_result;