X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=77c5d26fe92241199549b7334550cd0feb05d666;hb=a6f91e78d27906d413c9e53dc2ece06778e80412;hp=b1ded7c5d36db0ceef5a3b920f4f7816e352e122;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index b1ded7c..77c5d26 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -235,11 +235,10 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
     *dest = '\0';
   }
 
-  if (optional)
-    m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elstr, mutt_attach_fmt, data, 0);
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                mutt_attach_fmt, data, 0);
+  return src;
 }
 
 static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
@@ -250,8 +249,7 @@ static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
   entry.uid = KeyTable[num];
   entry.num = num + 1;
 
-  m_strformat(s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
-              (void*)&entry,
+  m_strformat(s, l, COLS - SW, PgpEntryFormat, pgp_entry_fmt, &entry,
               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }