X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=974aa16878638c131f95c578ceaa283b51278de1;hp=73b22cf9404ee6d904f940da34ddfb57d04dec29;hb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/curs_main.c b/curs_main.c
index 73b22cf..974aa16 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -18,7 +18,6 @@
 #include "mutt_curses.h"
 #include "mx.h"
 #include "mutt_menu.h"
-#include "mailbox.h"
 #include "mapping.h"
 #include "sort.h"
 #include "buffy.h"
@@ -459,7 +458,7 @@ int mutt_index_menu (void)
     mutt_buffy_check (1);       /* force the buffy check after we enter the folder */
     /* record folder we open to place sidebar indicator properly */
     if (Context && Context->path)
-      set_curbuffy (Context->path);
+      sidebar_set_current (Context->path);
   }
 
   FOREVER {
@@ -514,7 +513,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 */
-          draw_sidebar (CurrentMenu);
+          sidebar_draw (CurrentMenu);
           mutt_message (_("New mail in this mailbox."));
 
           if (option (OPTBEEPNEW))
@@ -556,10 +555,10 @@ int mutt_index_menu (void)
     if (op != -1)
       mutt_curs_set (0);
     if (menu->redraw & REDRAW_SIDEBAR)
-      draw_sidebar (menu->menu);
+      sidebar_draw (menu->menu);
     if (menu->redraw & REDRAW_FULL) {
       menu_redraw_full (menu);
-      draw_sidebar (menu->menu);
+      sidebar_draw (menu->menu);
       mutt_show_error ();
     }
 
@@ -585,7 +584,7 @@ int mutt_index_menu (void)
         SETCOLOR (MT_COLOR_STATUS);
         mutt_paddstr (COLS, buf);
         SETCOLOR (MT_COLOR_NORMAL);
-        set_buffystats (Context);
+        sidebar_set_buffystats (Context);
         menu->redraw &= ~REDRAW_STATUS;
         if (option (OPTXTERMSETTITLES)) {
           menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle));
@@ -1223,9 +1222,7 @@ int mutt_index_menu (void)
       }
 
       if (op == OP_SIDEBAR_OPEN) {
-        if (!CurBuffy)
-          break;
-        strncpy (buf, CurBuffy->path, sizeof (buf));
+        strncpy (buf, NONULL(sidebar_get_current ()), sizeof (buf));
       }
       else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) ==
                -1)
@@ -1243,23 +1240,23 @@ int mutt_index_menu (void)
       else
 #endif
         mutt_expand_path (buf, sizeof (buf));
-      set_curbuffy (buf);
+      sidebar_set_current (buf);
       if (mx_get_magic (buf) <= 0) {
         mutt_error (_("%s is not a mailbox."), buf);
         break;
       }
-      mutt_str_replace (&CurrentFolder, buf);
+      str_replace (&CurrentFolder, buf);
 
       if (Context) {
         int check;
 
 #ifdef USE_COMPRESSED
         if (Context->compressinfo && Context->realpath)
-          mutt_str_replace (&LastFolder, Context->realpath);
+          str_replace (&LastFolder, Context->realpath);
         else
 #endif
 
-          mutt_str_replace (&LastFolder, Context->path);
+          str_replace (&LastFolder, Context->path);
         oldcount = Context ? Context->msgcount : 0;
 
         if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
@@ -2227,7 +2224,7 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
         sleep (2);
       }
       else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
-               mutt_strcasecmp (CURHDR->env->followup_to, "poster") ||
+               safe_strcasecmp (CURHDR->env->followup_to, "poster") ||
                query_quadoption (OPT_FOLLOWUPTOPOSTER,
                                  _("Reply by mail as poster prefers?")) !=
                M_YES) {
@@ -2377,7 +2374,7 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
     case OP_SIDEBAR_PREV:
     case OP_SIDEBAR_NEXT_NEW:
     case OP_SIDEBAR_PREV_NEW:
-      scroll_sidebar (op, menu->menu);
+      sidebar_scroll (op, menu->menu);
       break;
     default:
       if (menu->menu == MENU_MAIN)