Rocco Rutte:

[apps/madmutt.git] / pgp.c

diff --git a/pgp.c b/pgp.c
index 5580c69..3ed7d87 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -109,14 +109,8 @@ int pgp_use_gpg_agent (void) {
   if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO"))
     return 0;
 
-  if ((tty = ttyname(0))) {
-    char tmp[SHORT_STRING];
-    snprintf (tmp, sizeof (tmp), "GPG_TTY=%s", tty);
-    putenv (tmp);
-#if 0
-    setenv("GPG_TTY", tty, 0);
-#endif
-  }
+  if ((tty = ttyname(0)))
+    setenv ("GPG_TTY", tty, 0);
 
   return 1;
 }
@@ -381,6 +375,7 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
         }
 
         /* treat empty result as sign of failure */
+        /* TODO: maybe on failure mutt should include the original undecoded text. */
         if (pgpout) {
           rewind (pgpout);
           c = fgetc (pgpout);
@@ -390,8 +385,10 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
             mutt_error _("Could not decrypt PGP message");
             mutt_sleep (1);
             pgp_void_passphrase ();
-            rc = -1;
-            goto out;
+            if (!(s->flags & M_DISPLAY)) {
+              rc = -1;
+              goto out;
+            }
         }
       }