X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=ddb5be50334669a4c19102789a8aaab84f3992a4;hp=94b1d6faec8f2229456dcd37e1d25aa4ff912c41;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 94b1d6f..ddb5be5 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -10,52 +10,34 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
+#include <lib-crypt/crypt.h>
 
 #include <pop/pop.h>
 
+#include "curses.h"
+#include "menu.h"
+
 #include "mutt.h"
-#include "mx.h"
-#include "mutt_menu.h"
+#include "alias.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
-#include "mx.h"
-#include "sidebar.h"
 #include "thread.h"
-#include "xterm.h"
 
 #include <imap/imap_private.h>
 
-#include <lib-crypt/crypt.h>
-
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef USE_SASL
 #include "mutt_sasl.h"
 #endif
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <errno.h>
-
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
@@ -491,7 +473,7 @@ int mutt_index_menu (void)
                       ("Mailbox was externally modified.  Flags may be wrong."));
         else if (check == M_NEW_MAIL) {
           /* on new mail: redraw sidebar */
-          sidebar_draw (CurrentMenu);
+          sidebar_draw ();
           mutt_message (_("New mail in this mailbox."));
 
           if (option (OPTBEEPNEW))
@@ -531,10 +513,10 @@ int mutt_index_menu (void)
     if (op != -1)
       mutt_curs_set (0);
     if (menu->redraw & REDRAW_SIDEBAR)
-      sidebar_draw (menu->menu);
+      sidebar_draw ();
     if (menu->redraw & REDRAW_FULL) {
       menu_redraw_full (menu);
-      sidebar_draw (menu->menu);
+      sidebar_draw ();
       mutt_show_error ();
     }
 
@@ -565,10 +547,11 @@ int mutt_index_menu (void)
         sidebar_set_buffystats (Context);
         menu->redraw &= ~REDRAW_STATUS;
         if (option (OPTXTERMSETTITLES)) {
-          menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle));
-          mutt_xterm_set_title (buf);
-          menu_status_line (buf, sizeof (buf), menu, NONULL (XtermIcon));
-          mutt_xterm_set_icon (buf);
+          menu_status_line(buf, sizeof(buf), menu, NONULL(XtermTitle));
+          printf("\033]2;%s\007", buf);
+          menu_status_line(buf, sizeof(buf), menu, NONULL(XtermIcon));
+          printf("\033]1;%s\007", buf);
+          fflush(stdout);
         }
       }
 
@@ -605,8 +588,6 @@ int mutt_index_menu (void)
 
       op = km_dokey (MENU_MAIN);
 
-      debug_print (4, ("Got op %d\n", op));
-
       if (op == -1)
         continue;               /* either user abort or timeout */
 
@@ -752,7 +733,7 @@ int mutt_index_menu (void)
             break;
         }
         else {
-          LIST *ref = CURHDR->env->references;
+          string_list_t *ref = CURHDR->env->references;
 
           if (!ref) {
             mutt_error (_("Article has no parent reference!"));
@@ -808,7 +789,7 @@ int mutt_index_menu (void)
         m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
 
         if (op == OP_RECONSTRUCT_THREAD) {
-          LIST *ref = CURHDR->env->references;
+          string_list_t *ref = CURHDR->env->references;
 
           while (ref) {
             nntp_check_msgid (Context, ref->data);
@@ -1227,7 +1208,7 @@ int mutt_index_menu (void)
       if (Context) {
         int check;
 
-        if (Context->compressinfo && Context->realpath)
+        if (Context->cinfo && Context->realpath)
           m_strreplace(&LastFolder, Context->realpath);
         else
           m_strreplace(&LastFolder, Context->path);
@@ -2325,7 +2306,7 @@ int mutt_index_menu (void)
     case OP_SIDEBAR_PREV:
     case OP_SIDEBAR_NEXT_NEW:
     case OP_SIDEBAR_PREV_NEW:
-      sidebar_scroll (op, menu->menu);
+      sidebar_scroll (op);
       break;
     default:
       if (menu->menu == MENU_MAIN)