1 files changed, 14 insertions, 14 deletions

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);