Experimental: New PGP invocation interface. The invocations are done

through formats, so all this should fit more cleanly into mutt now.

1 files changed, 0 insertions, 47 deletions

diff --git a/init.c b/init.c
index 22436654..3195581c 100644
--- a/init.c
+++ b/init.c
@@ -1622,53 +1622,6 @@ void mutt_init (int skip_sys_rc, LIST *commands)
 
   Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp");
 
-  
-
-#ifdef _PGPPATH
-#ifdef _PGPV2PATH
-  PgpV2 = safe_strdup (_PGPV2PATH);
-  if ((p = getenv("PGPPATH")) != NULL)
-  {
-    snprintf (buffer, sizeof (buffer), "%s/pubring.pgp", p);
-    PgpV2Pubring = safe_strdup (buffer);
-    snprintf (buffer, sizeof (buffer), "%s/secring.pgp", p); 
-    PgpV2Secring = safe_strdup (buffer);
-  }
-  else
-  {
-    snprintf (buffer, sizeof (buffer), "%s/.pgp/pubring.pgp", NONULL(Homedir));
-    PgpV2Pubring = safe_strdup (buffer);
-    snprintf (buffer, sizeof (buffer), "%s/.pgp/secring.pgp", NONULL(Homedir));
-    PgpV2Secring = safe_strdup (buffer);
-  }
-#endif
-
-#ifdef _PGPV3PATH
-  PgpV3 = safe_strdup (_PGPV3PATH);
-  if ((p = getenv("PGPPATH")) != NULL)
-  {
-    snprintf (buffer, sizeof (buffer), "%s/pubring.pkr", p);
-    PgpV3Pubring = safe_strdup (buffer);
-    snprintf (buffer, sizeof (buffer), "%s/secring.skr", p); 
-    PgpV3Secring = safe_strdup (buffer);
-  }
-  else
-  {
-    snprintf (buffer, sizeof (buffer), "%s/.pgp/pubring.pkr", NONULL(Homedir));
-    PgpV3Pubring = safe_strdup (buffer);
-    snprintf (buffer, sizeof (buffer), "%s/.pgp/secring.skr", NONULL(Homedir));
-    PgpV3Secring = safe_strdup (buffer);
-  }
-#endif
-  
-#ifdef _PGPGPGPATH
-  PgpGpg = safe_strdup (_PGPGPGPATH);
-#endif
-
-#endif /* _PGPPATH */
-  
-  
-
 #ifdef USE_POP
   PopUser = safe_strdup (Username);
 #endif