Allow to cancel marktrusted.

agent/ChangeLog

@@ -1,3 +1,13 @@
+2006-10-16  Werner Koch  <wk@g10code.com>
+
+	* call-pinentry.c (agent_get_confirmation): Map Cancel code here too.
+	* trustlist.c (agent_marktrusted): Return Cancel instead of
+	Not_Confirmed for the first question.
+
+2006-10-12  Werner Koch  <wk@g10code.com>
+
+	* protect-tool.c (get_passphrase): Fix if !HAVE_LANGINFO_CODESET.
+
 2006-10-06  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (AM_CFLAGS): Use PTH version of libassuan.

agent/call-pinentry.c

@@ -582,6 +582,9 @@ agent_get_confirmation (ctrl_t ctrl,
     }
 
   rc = assuan_transact (entry_ctx, "CONFIRM", NULL, NULL, NULL, NULL, NULL, NULL);
+  if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
+    rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
+
   return unlock_pinentry (rc);
 }
 

agent/protect-tool.c

@@ -1170,7 +1170,7 @@ get_passphrase (int promptno)
   char *pw;
   int err;
   const char *desc;
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef ENABLE_NLS
   char *orig_codeset = NULL;
 #endif
   int error_msgno;

agent/trustlist.c

@@ -479,8 +479,14 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
      button is "the default "Cancel" of the Pinentry. */
   err = agent_get_confirmation (ctrl, desc, _("Correct"), NULL);
   free (desc);
+  /* If the user did not confirmed this, we return cancel here so that
+     gpgsm may stop asking further questions.  We won't do this for
+     the second question of course. */
   if (err)
-    return err;
+    return (gpg_err_code (err) == GPG_ERR_NOT_CONFIRMED ? 
+            gpg_err_make (gpg_err_source (err), GPG_ERR_CANCELED) : err);
+
+
 
   if (asprintf (&desc,
                 /* TRANSLATORS: This prompt is shown by the Pinentry