more simplifications. also fix gpgme crypt menu

[apps/madmutt.git] / lib-crypt / crypt-gpgme.c

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index e575b3b..07bc706 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -6,10 +6,9 @@
  * Copyright (C) 2001  Thomas Roessler <roessler@guug.de>
  *                     Oliver Ehli <elmy@acm.org>
  * Copyright (C) 2002, 2003, 2004 g10 Code GmbH
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
+ */
+/*
+ * Copyright © 2006 Pierre Habouzit
  */
 
 #include <lib-lib/lib-lib.h>
@@ -72,17 +71,6 @@ typedef struct crypt_entry {
 static struct crypt_cache *id_defaults = NULL;
 static gpgme_key_t signature_key = NULL;
 
-/* Show a message that a backend will be invoked. */
-void crypt_invoke_message (int type)
-{
-    if (type & APPLICATION_PGP) {
-        mutt_message _("Invoking PGP...");
-    }
-    else if (type & APPLICATION_SMIME) {
-        mutt_message _("Invoking S/MIME...");
-    }
-}
-
 /*
  * General helper functions.
  */
@@ -3711,7 +3699,7 @@ char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc)
   return find_keys (to, cc, bcc, APPLICATION_SMIME);
 }
 
-static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
+int crypt_send_menu (HEADER * msg, int *redraw, int is_smime)
 {
   crypt_key_t *p;
   char input_signas[STRING];
@@ -3726,12 +3714,12 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
     choice =
       mutt_multi_choice (_
                          ("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"),
-                         _("esabpfc"));
+                         _("esabpc"));
   else
     choice =
       mutt_multi_choice (_
                          ("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"),
-                         _("esabmfc"));
+                         _("esabmc"));
 
   switch (choice) {
   case 1:                      /* (e)ncrypt */
@@ -3745,7 +3733,6 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
     break;
 
   case 3:                      /* sign (a)s */
-/*      unset_option(OPTCRYPTCHECKTRUST); */
     if ((p = crypt_ask_for_key (_("Sign as: "), NULL, KEYFLAG_CANSIGN,
                                 is_smime ? APPLICATION_SMIME :
                                 APPLICATION_PGP, NULL))) {
@@ -3769,31 +3756,18 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
     break;
 
   case 6:                      /* (c)lear */
-    msg->security = 0;
-    break;
+    return msg->security = 0;
   }
 
-  if (choice == 6 || choice == 7);
-  else if (is_smime) {
+  if (is_smime) {
     msg->security &= ~APPLICATION_PGP;
     msg->security |= APPLICATION_SMIME;
-  }
-  else {
+  } else {
     msg->security &= ~APPLICATION_SMIME;
     msg->security |= APPLICATION_PGP;
   }
 
-  return (msg->security);
-}
-
-int crypt_pgp_send_menu(HEADER * msg, int *redraw)
-{
-  return gpgme_send_menu(msg, redraw, 0);
-}
-
-int crypt_smime_send_menu(HEADER * msg, int *redraw)
-{
-  return gpgme_send_menu (msg, redraw, 1);
+  return msg->security;
 }
 
 int crypt_smime_verify_sender (HEADER * h)