diff options
author | Marcus Brinkmann <[email protected]> | 2003-05-27 09:00:02 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2003-05-27 09:00:02 +0000 |
commit | d5d26aecbce26c05e948af6f5f99fd4561497c28 (patch) | |
tree | ec828ac56f450784b87c6cf049e1a45bc1380ae5 | |
parent | Fix last changes. (diff) | |
download | gpgme-d5d26aecbce26c05e948af6f5f99fd4561497c28.tar.gz gpgme-d5d26aecbce26c05e948af6f5f99fd4561497c28.zip |
2003-05-27 Marcus Brinkmann <[email protected]>
* gpgme.h (struct _gpgme_op_import_result): Add skipped_new_keys.
* import.c (parse_import_res): Add skipped_new_keys parser.
-rw-r--r-- | gpgme/ChangeLog | 3 | ||||
-rw-r--r-- | gpgme/gpgme.h | 3 | ||||
-rw-r--r-- | gpgme/import.c | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 133f970a..fb14e561 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,8 @@ 2003-05-27 Marcus Brinkmann <[email protected]> + * 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/gpgme/gpgme.h b/gpgme/gpgme.h index 3ed71a66..de417453 100644 --- a/gpgme/gpgme.h +++ b/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/gpgme/import.c b/gpgme/import.c index ea245a3d..ba5a65de 100644 --- a/gpgme/import.c +++ b/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; |