2002-07-27 Marcus Brinkmann <marcus@g10code.de>

	* delete.c (delete_problem): New case ambigious specification.
	(delete_status_handler): Handle new case (poorly).

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index f6f2d93ac9dda9472ee9333d3da1b68837fc1601..11432d43677cc88e49d657a98850d81a941d44bc 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-27  Marcus Brinkmann  <marcus@g10code.de>
+
+       * delete.c (delete_problem): New case ambigious specification.
+       (delete_status_handler): Handle new case (poorly).
+
 2002-07-25  Marcus Brinkmann  <marcus@g10code.de>
 
        * engine-gpgsm.c (_gpgme_gpgsm_op_delete): Implement this.

diff --git a/gpgme/delete.c b/gpgme/delete.c
index 5a08a12db0e7aa6d00ac0034c7320197c8877301..94d28fe61529eb958ccd83c487529441650dc558 100644 (file)
--- a/gpgme/delete.c
+++ b/gpgme/delete.c
@@ -35,7 +35,8 @@ enum delete_problem
   {
     DELETE_No_Problem = 0,
     DELETE_No_Such_Key = 1,
-    DELETE_Must_Delete_Secret_Key = 2
+    DELETE_Must_Delete_Secret_Key = 2,
+    DELETE_Ambiguous_Specification = 3
   };
 
 
@@ -74,6 +75,8 @@ delete_status_handler (GpgmeCtx ctx, GpgStatusCode code, char *args)
        case DELETE_Must_Delete_Secret_Key:
          ctx->error = mk_error(Conflict);
          break;
+       case DELETE_Ambiguous_Specification:
+         /* XXX Need better error value.  Fall through.  */
        default:
          ctx->error = mk_error(General_Error);
          break;