From 885243e05467e79e2375b3febe7904053ab45dfc Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 14 Feb 2012 13:03:46 +0100 Subject: Rework status table to be less dynamically generated. * src/Makefile.am (EXTRA_DIST): Remove mkstatus. (BUILT_SOURCE, MOSTLYCLEANFILES): Remove. (main_sources): Remove status-table.h, extra-stati.h. Add status-table.c. (status-table.h): Remove rules for built source. * src/decrypt.c: Don't include extra-stati.h. * src/engine-gpg.c: Don't include status-table.h. (status_cmp): Remove function. (read_status): Use _gpgme_parse_status. * src/engine-gpgsm.c: Don't include status-table.h. (status_cmp, parse_status): Remove function. (gpgsm_assuan_simple_command, status_handler): Use _gpgme_parse_status. * src/engine-uiserver.c: Don't include status-table.h. (status_cmp, parse_status): Remove function. (uiserver_assuan_simple_command, status_handler): Use _gpgme_parse_status. * src/gpgme.h.in (gpgme_status_code_t): Add GPGME_STATUS_DECRYPTION_INFO. * src/util.h (_gpgme_status_init,_gpgme_parse_status): New declaration. * src/status-table.c: New file. * src/extra-stati.h, src/mkstatus: Files removed. * version.c (do_subsystem_inits): Call _gpgme_status_init. --- src/version.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/version.c') diff --git a/src/version.c b/src/version.c index e02037e9..3aef4045 100644 --- a/src/version.c +++ b/src/version.c @@ -35,8 +35,9 @@ #include "debug.h" #include "context.h" -/* For _gpgme_sema_subsystem_init (). */ +/* For _gpgme_sema_subsystem_init and _gpgme_status_init. */ #include "sema.h" +#include "util.h" #ifdef HAVE_ASSUAN_H #include "assuan.h" @@ -76,6 +77,7 @@ do_subsystem_inits (void) _gpgme_sema_subsystem_init (); _gpgme_debug_subsystem_init (); _gpgme_io_subsystem_init (); + _gpgme_status_init (); done = 1; } -- cgit v1.2.3