X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgp.c;h=c6e19e613a6d24f331620a97d3a35e1fb48b131c;hp=ab582c3798540bd8e214539633a61aadc38b1378;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=33d07d4040a973a004c4a729fd1f56a63a7203e6

diff --git a/pgp.c b/pgp.c
index ab582c3..c6e19e6 100644
--- a/pgp.c
+++ b/pgp.c
@@ -59,8 +59,6 @@
 # include <sys/resource.h>
 #endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 #include "mutt_menu.h"
 
@@ -1491,9 +1489,6 @@ int pgp_send_menu (HEADER * msg, int *redraw)
 
   char prompt[LONG_STRING];
 
-  if (!(WithCrypto & APPLICATION_PGP))
-    return msg->security;
-
   /* If autoinline and no crypto options set, then set inline. */
   if (option (OPTPGPAUTOINLINE) && !((msg->security & APPLICATION_PGP)
                                      && (msg->security & (SIGN | ENCRYPT))))
@@ -1521,7 +1516,7 @@ int pgp_send_menu (HEADER * msg, int *redraw)
          pgp_ask_for_key (_("Sign as: "), NULL, KEYFLAG_CANSIGN,
                           PGP_PUBRING))) {
       snprintf (input_signas, sizeof (input_signas), "0x%s", pgp_keyid (p));
-      str_replace (&PgpSignAs, input_signas);
+      m_strreplace(&PgpSignAs, input_signas);
       pgp_free_key (&p);
 
       msg->security |= SIGN;
@@ -1563,6 +1558,3 @@ int pgp_send_menu (HEADER * msg, int *redraw)
 
   return (msg->security);
 }
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */