X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=f2b6cb26d8beec80bfb1d4d98fc1e374e169745e;hp=7720241dd8840ea332bcc9ea2d9a5d771a5e86a8;hb=fa7f733a61a6fe3143198791ab470ddf4d08fdbe;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/curs_main.c b/curs_main.c
index 7720241..f2b6cb2 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1,19 +1,13 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * Parts were written/modified by:
+ * Nico Golde <nico@ngolde.de>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -45,6 +39,9 @@
 #include "nntp.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -462,7 +459,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 {
@@ -517,7 +514,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))
@@ -559,10 +556,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 ();
     }
 
@@ -588,7 +585,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));
@@ -1226,9 +1223,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)
@@ -1246,7 +1241,7 @@ 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;
@@ -2380,7 +2375,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)