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, 13 insertions, 17 deletions

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