From e88c7782bf6917dd01bd55a1ff4275644cae823b Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 10 Nov 2009 14:54:39 +0000 Subject: 2009-11-10 Marcus Brinkmann * gpgme.c (gpgme_new): Set default sub protocol. * gpgme-tool.c: Implement get sub protocol. --- src/gpgme-tool.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/gpgme-tool.c') diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index 0283ffd2..ccb2ae48 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -798,6 +798,18 @@ gt_set_protocol (gpgme_tool_t gt, gpgme_protocol_t proto) } +gpg_error_t +gt_get_protocol (gpgme_tool_t gt) +{ + gpgme_protocol_t proto = gpgme_get_protocol (gt->ctx); + + gt_write_status (gt, STATUS_PROTOCOL, gpgme_get_protocol_name (proto), + NULL); + + return 0; +} + + gpg_error_t gt_set_sub_protocol (gpgme_tool_t gt, gpgme_protocol_t proto) { @@ -806,9 +818,9 @@ gt_set_sub_protocol (gpgme_tool_t gt, gpgme_protocol_t proto) gpg_error_t -gt_get_protocol (gpgme_tool_t gt) +gt_get_sub_protocol (gpgme_tool_t gt) { - gpgme_protocol_t proto = gpgme_get_protocol (gt->ctx); + gpgme_protocol_t proto = gpgme_get_sub_protocol (gt->ctx); gt_write_status (gt, STATUS_PROTOCOL, gpgme_get_protocol_name (proto), NULL); @@ -1268,8 +1280,8 @@ cmd_sub_protocol (assuan_context_t ctx, char *line) struct server *server = assuan_get_pointer (ctx); if (line && *line) return gt_set_sub_protocol (server->gt, gt_protocol_from_name (line)); - /* FIXME. */ - return 0; + else + return gt_get_sub_protocol (server->gt); } -- cgit v1.2.3