2003-05-27 Marcus Brinkmann <marcus@g10code.de>

	* 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 133f970a011894fd8b6189eb6dbeb0e3008c34cd..fb14e561ca2da7e3586a2542da90b056053fc76e 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2003-05-27  Marcus Brinkmann  <marcus@g10code.de>
 
+       * 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 3ed71a66bbb87b51e5bb1c05729e043a4234a167..de4174534caaf57bd0ce7d48d79c89982b50a3f0 100644 (file)
--- 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 ea245a3d3522a5ad57761351c35ef1d726747c75..ba5a65de7a3050e5e3aa770667cddcccd8842d28 100644 (file)
--- 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;