X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=lib-ui%2Fcurs_main.c;h=d83f1bffdca3e6b675aef478fd82fc957f22a9d3;hb=9946738a6a1c27a5602a14d1afe2eea2389732b2;hp=b094f23f561d4a0be79097d8a5532363883eee75;hpb=0ab517261694b001d2eb17f06f167a4cdd2c7c07;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index b094f23..d83f1bf 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -14,7 +14,7 @@
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
-#include <pop/pop.h>
+#include "pop.h"
 
 #include "curses.h"
 #include "menu.h"
@@ -27,6 +27,7 @@
 #include "recvattach.h"
 #include "buffy.h"
 #include "thread.h"
+#include "score.h"
 
 #include <imap/imap_private.h>
 
@@ -393,10 +394,10 @@ int mutt_index_menu (void)
   int oldcount = -1;
   int rc = -1;
   MUTTMENU *menu;
-  char *cp;                     /* temporary variable. */
+  const char *cp;               /* temporary variable. */
   int index_hint;               /* used to restore cursor position */
   int do_buffy_notify = 1;
-  int closed = 0;                /* did we OP_QUIT or OP_EXIT out of this menu? */
+  int closed = 0;               /* did we OP_QUIT or OP_EXIT out of this menu? */
   int attach_msg = option (OPTATTACHMSG);
 
   menu = mutt_new_menu ();
@@ -474,7 +475,7 @@ int mutt_index_menu (void)
           sidebar_draw ();
           mutt_message (_("New mail in this mailbox."));
 
-          if (MCore.beep_new)
+          if (mod_core.beep_new)
             beep ();
         }
         else if (check == M_FLAGS)
@@ -501,7 +502,7 @@ int mutt_index_menu (void)
         menu->redraw |= REDRAW_SIDEBAR;
       }
       if (do_buffy_notify) {
-        if (buffy_notify () && MCore.beep_new)
+        if (buffy_notify () && mod_core.beep_new)
           beep ();
       }
       else
@@ -969,7 +970,7 @@ int mutt_index_menu (void)
         break;
       }
 
-      if (query_quadoption2(MCore.quit, _("Quit Madmutt?")) == M_YES) {
+      if (query_quadoption2(mod_core.quit, _("Quit Madmutt?")) == M_YES) {
         int check;
 
         oldcount = Context ? Context->msgcount : 0;
@@ -1297,7 +1298,7 @@ int mutt_index_menu (void)
       }
 
       if ((menu->menu == MENU_MAIN)
-          && (query_quadoption2(MCore.quit,
+          && (query_quadoption2(mod_core.quit,
                                 _("Exit Madmutt without saving?")) == M_YES))
       {
         if (Context) {
@@ -1742,8 +1743,7 @@ int mutt_index_menu (void)
       CHECK_VISIBLE;
       CHECK_READONLY;
 
-      if (mutt_change_flag (tag ? NULL : CURHDR, (op == OP_MAIN_SET_FLAG)) ==
-          0) {
+      if (mutt_change_flag (tag ? NULL : CURHDR, (op == OP_MAIN_SET_FLAG)) == 0) {
         menu->redraw = REDRAW_STATUS;
         if (tag)
           menu->redraw |= REDRAW_INDEX;