diff options
| author | Marcus Brinkmann <[email protected]> | 2003-01-30 23:02:14 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-01-30 23:02:14 +0000 |
| commit | 83d3b3f449790be314d418eb7edb3d3b0adb01b0 (patch) | |
| tree | 348380301bdd6b22dc9cf15034d117fa6ce95ab3 /gpgme/engine.h | |
| parent | 2003-01-30 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-83d3b3f449790be314d418eb7edb3d3b0adb01b0.tar.gz gpgme-83d3b3f449790be314d418eb7edb3d3b0adb01b0.zip | |
2003-01-30 Marcus Brinkmann <[email protected]>
* types.h: File removed.
* Makefile.am (libgpgme_la_SOURCES): Remove types.h.
* io.h (struct spawn_fd_item_s): Do not include "types.h".
* key.h: Likewise.
* context.h: Likewise.
* cengine-gpgsm.h: Likewise.
* engine.h: Include "gpgme.h" instead "types.h". Add prototypes
for EngineStatusHandler, EngineColonLineHandler and
EngineCommandHandler.
(_gpgme_engine_set_status_handler): Change parameter type from
GpgmeStatusHandler to EngineStatusHandler.
(_gpgme_engine_set_command_handler): Change parameter type from
GpgmeCommandHandler to EngineCommandHandler.
(_gpgme_engine_set_colon_line_handler): Change parameter type from
GpgmeColonLineHandler to EngineColonLineHandler.
* engine-backend.h: Include "engine.h" instead "types.h".
(struct engine_ops): Change Gpgme*Handler parameters in members
set_command_handler, set_colon_line_handler and set_status_handler
to Engine*Handler.
* engine.c (_gpgme_engine_set_status_handler): Change parameter
type from GpgmeStatusHandler to EngineStatusHandler.
(_gpgme_engine_set_command_handler): Change parameter type from
GpgmeCommandHandler to EngineCommandHandler.
(_gpgme_engine_set_colon_line_handler): Change parameter type from
GpgmeColonLineHandler to EngineColonLineHandler.
* rungpg.c (struct gpg_object_s): Change type of member status.fnc
from GpgmeStatusHandler to EngineStatusHandler. Change type of
member colon.fnc from GpgmeColonLineHandler to
EngineColonLineHandler. Change type of member cmd.fnc from
GpgmeCommandHandler to EngineCommandHandler.
* engine-gpgsm.c (struct gpgsm_object_s): Likewise.
* rungpg.c (gpg_set_status_handler): Change parameter type from
GpgmeStatusHandler to EngineStatusHandler.
* engine-gpgsm.c (gpgsm_set_status_handler): Likewise.
(assuan_simple_command): Likewise.
* rungpg.c (gpg_set_colon_line_handler): Change parameter type
from GpgmeColonLineHandler to EngineColonLineHandler.
* engine-gpgsm.c (gpgsm_set_colon_line_handler): Likewise.
* rungpg.c (gpg_set_command_handler): Change parameter type from
GpgmeCommandHandler to EngineCommandHandler.
Diffstat (limited to '')
| -rw-r--r-- | gpgme/engine.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gpgme/engine.h b/gpgme/engine.h index a56ec85f..25870ba1 100644 --- a/gpgme/engine.h +++ b/gpgme/engine.h @@ -21,22 +21,29 @@ #ifndef ENGINE_H #define ENGINE_H -#include "types.h" +#include "gpgme.h" struct engine_object_s; typedef struct engine_object_s *EngineObject; +typedef GpgmeError (*EngineStatusHandler) (void *priv, GpgmeStatusCode code, + char *args); +typedef GpgmeError (*EngineColonLineHandler) (void *priv, char *line); +typedef GpgmeError (*EngineCommandHandler) (void *priv, GpgmeStatusCode code, + const char *keyword, + const char **result); + GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine); void _gpgme_engine_release (EngineObject engine); void _gpgme_engine_set_status_handler (EngineObject engine, - GpgmeStatusHandler fnc, + EngineStatusHandler fnc, void *fnc_value); GpgmeError _gpgme_engine_set_command_handler (EngineObject engine, - GpgmeCommandHandler fnc, + EngineCommandHandler fnc, void *fnc_value, GpgmeData data); GpgmeError _gpgme_engine_set_colon_line_handler (EngineObject engine, - GpgmeColonLineHandler fnc, + EngineColonLineHandler fnc, void *fnc_value); void _gpgme_engine_set_verbosity (EngineObject engine, int verbosity); GpgmeError _gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph, |