create the lib-mx now

[apps/madmutt.git] / lib-ui / curs_main.c

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index bc868e3..6e20d66 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -13,6 +13,7 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #include <pop/pop.h>
 
@@ -21,11 +22,9 @@
 
 #include "mutt.h"
 #include "alias.h"
-#include "mx.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
-#include "mx.h"
 #include "thread.h"
 #include "xterm.h"
 
@@ -476,7 +475,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))
@@ -516,10 +515,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 ();
     }
 
@@ -1210,7 +1209,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);
@@ -2308,7 +2307,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)