From: Marcus Brinkmann Date: Tue, 27 May 2003 09:00:02 +0000 (+0000) Subject: 2003-05-27 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~607 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=419dde889d6f373641b83ce8f96b41c0f56252a3;p=gpgme.git 2003-05-27 Marcus Brinkmann * gpgme.h (struct _gpgme_op_import_result): Add skipped_new_keys. * import.c (parse_import_res): Add skipped_new_keys parser. --- diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 133f970..fb14e56 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,5 +1,8 @@ 2003-05-27 Marcus Brinkmann + * gpgme.h (struct _gpgme_op_import_result): Add skipped_new_keys. + * import.c (parse_import_res): Add skipped_new_keys parser. + * op-support.c (_gpgme_parse_inv_userid): Add missing break statements. * encrypt.c (gpgme_op_encrypt): Use gpgme_error_t instead of int. diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h index 3ed71a6..de41745 100644 --- a/trunk/gpgme/gpgme.h +++ b/trunk/gpgme/gpgme.h @@ -1240,6 +1240,9 @@ struct _gpgme_op_import_result /* Number of secret keys unchanged. */ int secret_unchanged; + /* Number of new keys skipped. */ + int skipped_new_keys; + /* Number of keys not imported. */ int not_imported; diff --git a/trunk/gpgme/import.c b/trunk/gpgme/import.c index ea245a3..ba5a65d 100644 --- a/trunk/gpgme/import.c +++ b/trunk/gpgme/import.c @@ -170,6 +170,7 @@ parse_import_res (char *args, gpgme_import_result_t result) PARSE_NEXT (result->secret_read); PARSE_NEXT (result->secret_imported); PARSE_NEXT (result->secret_unchanged); + PARSE_NEXT (result->skipped_new_keys); PARSE_NEXT (result->not_imported); return 0;