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, 35 insertions, 35 deletions

diff --git a/gpgme/engine.h b/gpgme/engine.h
index 75464029..95a9d1e7 100644
--- a/gpgme/engine.h
+++ b/gpgme/engine.h
@@ -26,67 +26,67 @@
 struct engine_object_s;
 typedef struct engine_object_s *EngineObject;
 
-typedef GpgmeError (*EngineStatusHandler) (void *priv, GpgmeStatusCode code,
+typedef gpgme_error_t (*EngineStatusHandler) (void *priv, gpgme_status_code_t code,
 					   char *args);
-typedef GpgmeError (*EngineColonLineHandler) (void *priv, char *line);
-typedef GpgmeError (*EngineCommandHandler) (void *priv, GpgmeStatusCode code,
+typedef gpgme_error_t (*EngineColonLineHandler) (void *priv, char *line);
+typedef gpgme_error_t (*EngineCommandHandler) (void *priv, gpgme_status_code_t code,
 					    const char *keyword,
 					    const char **result);
 
-GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine);
+gpgme_error_t _gpgme_engine_new (gpgme_protocol_t proto, EngineObject *r_engine);
 void _gpgme_engine_release (EngineObject engine);
 void _gpgme_engine_set_status_handler (EngineObject engine,
 				       EngineStatusHandler fnc,
 				       void *fnc_value);
-GpgmeError _gpgme_engine_set_command_handler (EngineObject engine,
+gpgme_error_t _gpgme_engine_set_command_handler (EngineObject engine,
 					      EngineCommandHandler fnc,
 					      void *fnc_value,
-					      GpgmeData data);
-GpgmeError _gpgme_engine_set_colon_line_handler (EngineObject engine,
+					      gpgme_data_t data);
+gpgme_error_t _gpgme_engine_set_colon_line_handler (EngineObject engine,
 						 EngineColonLineHandler fnc,
 						 void *fnc_value);
-GpgmeError _gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph,
-				     GpgmeData plain);
-GpgmeError _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key,
+gpgme_error_t _gpgme_engine_op_decrypt (EngineObject engine, gpgme_data_t ciph,
+				     gpgme_data_t plain);
+gpgme_error_t _gpgme_engine_op_delete (EngineObject engine, gpgme_key_t key,
 				    int allow_secret);
-GpgmeError _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key,
-				  GpgmeData out, GpgmeCtx ctx /* FIXME */);
-GpgmeError _gpgme_engine_op_encrypt (EngineObject engine, GpgmeRecipients recp,
-				     GpgmeData plain, GpgmeData ciph,
+gpgme_error_t _gpgme_engine_op_edit (EngineObject engine, gpgme_key_t key,
+				  gpgme_data_t out, gpgme_ctx_t ctx /* FIXME */);
+gpgme_error_t _gpgme_engine_op_encrypt (EngineObject engine, gpgme_recipients_t recp,
+				     gpgme_data_t plain, gpgme_data_t ciph,
 				     int use_armor);
-GpgmeError _gpgme_engine_op_encrypt_sign (EngineObject engine,
-					  GpgmeRecipients recp,
-					  GpgmeData plain, GpgmeData ciph,
+gpgme_error_t _gpgme_engine_op_encrypt_sign (EngineObject engine,
+					  gpgme_recipients_t recp,
+					  gpgme_data_t plain, gpgme_data_t ciph,
 					  int use_armor,
-					  GpgmeCtx ctx /* FIXME */);
-GpgmeError _gpgme_engine_op_export (EngineObject engine, GpgmeRecipients recp,
-				    GpgmeData keydata, int use_armor);
-GpgmeError _gpgme_engine_op_genkey (EngineObject engine, GpgmeData help_data,
-				    int use_armor, GpgmeData pubkey,
-				    GpgmeData seckey);
-GpgmeError _gpgme_engine_op_import (EngineObject engine, GpgmeData keydata);
-GpgmeError _gpgme_engine_op_keylist (EngineObject engine, const char *pattern,
+					  gpgme_ctx_t ctx /* FIXME */);
+gpgme_error_t _gpgme_engine_op_export (EngineObject engine, gpgme_recipients_t recp,
+				    gpgme_data_t keydata, int use_armor);
+gpgme_error_t _gpgme_engine_op_genkey (EngineObject engine, gpgme_data_t help_data,
+				    int use_armor, gpgme_data_t pubkey,
+				    gpgme_data_t seckey);
+gpgme_error_t _gpgme_engine_op_import (EngineObject engine, gpgme_data_t keydata);
+gpgme_error_t _gpgme_engine_op_keylist (EngineObject engine, const char *pattern,
 				     int secret_only,
 				     int keylist_mode);
-GpgmeError _gpgme_engine_op_keylist_ext (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_keylist_ext (EngineObject engine,
 					 const char *pattern[],
 					 int secret_only,
 					 int reserved,
 					 int keylist_mode);
-GpgmeError _gpgme_engine_op_sign (EngineObject engine, GpgmeData in,
-				  GpgmeData out, GpgmeSigMode mode,
+gpgme_error_t _gpgme_engine_op_sign (EngineObject engine, gpgme_data_t in,
+				  gpgme_data_t out, gpgme_sig_mode_t mode,
 				  int use_armor, int use_textmode,
 				  int include_certs,
-				  GpgmeCtx ctx /* FIXME */);
-GpgmeError _gpgme_engine_op_trustlist (EngineObject engine,
+				  gpgme_ctx_t ctx /* FIXME */);
+gpgme_error_t _gpgme_engine_op_trustlist (EngineObject engine,
 				       const char *pattern);
-GpgmeError _gpgme_engine_op_verify (EngineObject engine, GpgmeData sig,
-				    GpgmeData signed_text,
-				    GpgmeData plaintext);
+gpgme_error_t _gpgme_engine_op_verify (EngineObject engine, gpgme_data_t sig,
+				    gpgme_data_t signed_text,
+				    gpgme_data_t plaintext);
 
 void _gpgme_engine_set_io_cbs (EngineObject engine,
-			       struct GpgmeIOCbs *io_cbs);
+			       gpgme_io_cbs_t io_cbs);
 void _gpgme_engine_io_event (EngineObject engine,
-			     GpgmeEventIO type, void *type_data);
+			     gpgme_event_io_t type, void *type_data);
 
 #endif /* ENGINE_H */