X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=aed420ba5549638da6e792832a3dc255b162f967;hp=508c15136d9adb7465695fbaf4a1f0b01babd030;hb=4670d23c56f21afaa7ef2e0289a47a6a0d112671;hpb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc

diff --git a/compose.c b/compose.c
index 508c151..aed420b 100644
--- a/compose.c
+++ b/compose.c
@@ -148,20 +148,12 @@ static void redraw_crypt_lines (HEADER * msg)
 {
   int off = 0;
 
-  if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) {
-    if (!msg->security)
-      mvaddstr (HDR_CRYPT, SW, "    Security: ");
-    else if (msg->security & APPLICATION_SMIME)
-      mvaddstr (HDR_CRYPT, SW, "      S/MIME: ");
-    else if (msg->security & APPLICATION_PGP)
-      mvaddstr (HDR_CRYPT, SW, "         PGP: ");
-  }
-  else if ((WithCrypto & APPLICATION_SMIME))
+  if (!msg->security)
+    mvaddstr (HDR_CRYPT, SW, "    Security: ");
+  else if (msg->security & APPLICATION_SMIME)
     mvaddstr (HDR_CRYPT, SW, "      S/MIME: ");
-  else if ((WithCrypto & APPLICATION_PGP))
+  else if (msg->security & APPLICATION_PGP)
     mvaddstr (HDR_CRYPT, SW, "         PGP: ");
-  else
-    return;
 
   if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
     addstr (_("Sign, Encrypt"));
@@ -172,31 +164,27 @@ static void redraw_crypt_lines (HEADER * msg)
   else
     addstr (_("Clear"));
 
-  if ((WithCrypto & APPLICATION_PGP))
-    if ((msg->security & APPLICATION_PGP)
-        && (msg->security & (ENCRYPT | SIGN))) {
-      if ((msg->security & INLINE))
-        addstr (_(" (inline)"));
-      else
-        addstr (_(" (PGP/MIME)"));
-    }
+  if ((msg->security & APPLICATION_PGP)
+      && (msg->security & (ENCRYPT | SIGN))) {
+    if ((msg->security & INLINE))
+      addstr (_(" (inline)"));
+    else
+      addstr (_(" (PGP/MIME)"));
+  }
   clrtoeol ();
 
   move (HDR_CRYPTINFO, SW);
   clrtoeol ();
-  if ((WithCrypto & APPLICATION_PGP)
-      && msg->security & APPLICATION_PGP && msg->security & SIGN)
+  if (msg->security & APPLICATION_PGP && msg->security & SIGN)
     printw ("%s%s", _("     sign as: "),
             PgpSignAs ? PgpSignAs : _("<default>"));
 
-  if ((WithCrypto & APPLICATION_SMIME)
-      && msg->security & APPLICATION_SMIME && msg->security & SIGN) {
+  if (msg->security & APPLICATION_SMIME && msg->security & SIGN) {
     printw ("%s%s", _("     sign as: "),
             SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
   }
 
-  if ((WithCrypto & APPLICATION_SMIME)
-      && (msg->security & APPLICATION_SMIME)
+  if ((msg->security & APPLICATION_SMIME)
       && (msg->security & ENCRYPT)
       && SmimeCryptAlg && *SmimeCryptAlg) {
     mvprintw (HDR_CRYPTINFO, SW + 40, "%s%s", _("Encrypt with: "),
@@ -305,8 +293,7 @@ static void draw_envelope (HEADER * msg, char *fcc)
   mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
   mutt_paddstr (W, fcc);
 
-  if (WithCrypto)
-    redraw_crypt_lines (msg);
+  redraw_crypt_lines (msg);
 
 #ifdef MIXMASTER
   redraw_mix_line (msg->chain);
@@ -623,8 +610,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
           p_delete(&msg->env->newsgroups);
-          str_skip_trailws (buf);
-          msg->env->newsgroups = m_strdup(vskipspaces(buf));
+          m_strrtrim(buf);
+          msg->env->newsgroups = m_strdup(skipspaces(buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -641,8 +628,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
           p_delete(&msg->env->followup_to);
-          str_skip_trailws (buf);
-          msg->env->followup_to = m_strdup(vskipspaces(buf));
+          m_strrtrim(buf);
+          msg->env->followup_to = m_strdup(skipspaces(buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)
@@ -751,8 +738,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
 
     case OP_COMPOSE_ATTACH_KEY:
-      if (!(WithCrypto & APPLICATION_PGP))
-        break;
       if (idxlen == idxmax) {
         p_realloc(&idx, idxmax += 5);
         menu->data = idx;
@@ -1352,10 +1337,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
 
     case OP_COMPOSE_PGP_MENU:
-      if (!(WithCrypto & APPLICATION_PGP))
-        break;
-      if ((WithCrypto & APPLICATION_SMIME)
-          && msg->security & APPLICATION_SMIME) {
+      if (msg->security & APPLICATION_SMIME) {
         if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
                           M_YES) != M_YES) {
           mutt_clear_error ();
@@ -1375,11 +1357,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
 
     case OP_COMPOSE_SMIME_MENU:
-      if (!(WithCrypto & APPLICATION_SMIME))
-        break;
-
-      if ((WithCrypto & APPLICATION_PGP)
-          && msg->security & APPLICATION_PGP) {
+      if (msg->security & APPLICATION_PGP) {
         if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
                           M_YES) != M_YES) {
           mutt_clear_error ();