Andreas Krennmair:

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index ef7ee18..ddf10cc 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -17,6 +17,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 

+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+

 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"


@@ -61,6 +65,9 @@ enum
   HDR_REPLYTO,
   HDR_FCC,
 
   HDR_REPLYTO,
   HDR_FCC,
 

+#ifdef MIXMASTER  
+  HDR_MIX,
+#endif

 
   HDR_CRYPT,
   HDR_CRYPTINFO,
 
   HDR_CRYPT,
   HDR_CRYPTINFO,


@@ -71,7 +78,11 @@ enum
   HDR_XCOMMENTTO,
 #endif
 
   HDR_XCOMMENTTO,
 #endif
 

+#ifndef USE_NNTP

   HDR_ATTACH  = (HDR_FCC + 5) /* where to start printing the attachments */
   HDR_ATTACH  = (HDR_FCC + 5) /* where to start printing the attachments */

+#else
+  HDR_ATTACH  = (HDR_FCC + 7) 
+#endif

 };
 
 #define HDR_XOFFSET 14
 };
 
 #define HDR_XOFFSET 14


@@ -179,11 +190,11 @@ static void redraw_crypt_lines (HEADER *msg)
   clrtoeol ();
   if ((WithCrypto & APPLICATION_PGP)
       && msg->security & APPLICATION_PGP  && msg->security & SIGN)
   clrtoeol ();
   if ((WithCrypto & APPLICATION_PGP)
       && msg->security & APPLICATION_PGP  && msg->security & SIGN)

-    printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
+    printw ("%s%s", _("     sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));

 
   if ((WithCrypto & APPLICATION_SMIME)
      && msg->security & APPLICATION_SMIME  && msg->security & SIGN) {
 
   if ((WithCrypto & APPLICATION_SMIME)
      && msg->security & APPLICATION_SMIME  && msg->security & SIGN) {

-      printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
+      printw ("%s%s", _("     sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));

   }
 
   if ((WithCrypto & APPLICATION_SMIME)
   }
 
   if ((WithCrypto & APPLICATION_SMIME)


@@ -205,7 +216,7 @@ static void redraw_mix_line (LIST *chain)
   int c;
   char *t;
 
   int c;
   char *t;
 

-  mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
+  mvaddstr (HDR_MIX, SidebarWidth,     "         Mix: ");

 
   if (!chain)
   {
 
   if (!chain)
   {


@@ -290,9 +301,9 @@ static void draw_envelope (HEADER *msg, char *fcc)
   }
   else
   {
   }
   else
   {

-    mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);
+    mvprintw (HDR_TO, SidebarWidth, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);

     mutt_paddstr (W, NONULL (msg->env->newsgroups));
     mutt_paddstr (W, NONULL (msg->env->newsgroups));

-    mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);
+    mvprintw (HDR_CC, SidebarWidth, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);

     mutt_paddstr (W, NONULL (msg->env->followup_to));
     if (option (OPTXCOMMENTTO))
     {
     mutt_paddstr (W, NONULL (msg->env->followup_to));
     if (option (OPTXCOMMENTTO))
     {


@@ -497,7 +508,7 @@ compose_format_str (char *buf, size_t buflen, char op, const char *src,
       break;
 
     case 'v':
       break;
 
     case 'v':

-      snprintf (fmt, sizeof (fmt), "Mutt %%s");
+      snprintf (fmt, sizeof (fmt), "Mutt-ng %%s");

       snprintf (buf, buflen, fmt, MUTT_VERSION);
       break;
 
       snprintf (buf, buflen, fmt, MUTT_VERSION);
       break;
 


@@ -577,6 +588,8 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 #endif
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
   
 #endif
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
   

+  if (option(OPTMBOXPANE))
+    mutt_buffy_check(1);

   while (loop)
   {
 #ifdef USE_NNTP
   while (loop)
   {
 #ifdef USE_NNTP