Changeset 1516:b26d80b098f3 for commands.c

Timestamp:

2000-02-10 11:46:06 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

PGP-cleanup patch from Roland Rosenfeld. Thanks!

Files:

• commands.c (modified) (14 diffs)

commands.c

@@ -37 +37 @@
 
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
 #include "pgp.h"
 #endif
@@ -78 +78 @@
 
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   /* see if PGP is needed for this message.  if so, we should exit curses */
   if (cur->pgp)
@@ -140 +140 @@
   }
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   /* update PGP information for this message */
   cur->pgp |= pgp_query (cur->content);
@@ -149 +149 @@
     pager_t info;
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
     if (cur->pgp & PGPGOODSIGN)
       mutt_message _("PGP signature successfully verified.");
@@ -278 +278 @@
 
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
     if (option (OPTPIPEDECODE))
     {
@@ -300 +300 @@
 
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
 
     if(option(OPTPIPEDECODE))
@@ -487 +487 @@
   *chflags = CH_UPDATE_LEN;
   
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   if (!decode && decrypt && (hdr->pgp & PGPENCRYPT))
   {
@@ -539 +539 @@
 {
   int i, need_buffy_cleanup;
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   int need_passphrase = 0;
 #endif
@@ -560 +560 @@
   if (h)
   {
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
     need_passphrase = h->pgp & PGPENCRYPT;
 #endif
@@ -581 +581 @@
     {
       mutt_default_save (buf, sizeof (buf), h);
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
       need_passphrase |= h->pgp & PGPENCRYPT;
 #endif
@@ -620 +620 @@
   }
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   if(need_passphrase && (decode || decrypt) && !pgp_valid_passphrase())
     return -1;
@@ -698 +698 @@
   }
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   if (h->pgp & PGPENCRYPT)
   {
@@ -794 +794 @@
   }
 
-#ifdef _PGPPATH
+#ifdef HAVE_PGP
   if (h)
   {
@@ -801 +801 @@
     h->pgp |= pgp_query (b);
   }
-#endif /* _PGPPATH */
-
-}
+#endif /* HAVE_PGP */
+
+}