X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=ae9c5405555628c6723cf39aa87d2e93b274c9e4;hp=12c41a9ee5ecf662eb0a32d3207b67c0aee03414;hb=f288d1771c814e6104da83e6f0f1761a40de1224;hpb=56025510c87ad388a257fcbd8b369b0edcf97c34

diff --git a/browser.c b/browser.c
index 12c41a9..ae9c540 100644
--- a/browser.c
+++ b/browser.c
@@ -7,29 +7,16 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <stdlib.h>
 #include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -43,7 +30,6 @@
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
-#include "sidebar.h"
 
 #include "lib/list.h"
 
@@ -490,7 +476,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       add_folder (menu, state, data->group, NULL, data->new);
 #endif
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else
 #endif /* USE_NNTP */
@@ -556,7 +542,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     }
     closedir (dp);
   }
-  sidebar_draw (CurrentMenu);
+  sidebar_draw ();
   browser_sort (state);
   return 0;
 }
@@ -584,12 +570,12 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
                          (!option (OPTSHOWONLYUNREAD)|| data->unread))))
         add_folder (menu, state, data->group, NULL, data, data->new);
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else
 #endif
   {
-    unsigned int i = 0;
+    int i = 0;
     BUFFY* tmp;
 
     if (!Incoming)
@@ -1339,7 +1325,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         b = mutt_make_file_attach (nbuf);
         if (b != NULL) {
           mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
-          mutt_free_body (&b);
+          body_list_wipe(&b);
           menu->redraw = REDRAW_FULL;
         }
         else
@@ -1351,29 +1337,15 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
     case OP_CATCHUP:
     case OP_UNCATCHUP:
       if (option (OPTNEWS)) {
-        struct folder_file *f = &state.entry[menu->current];
+        struct folder_file *folder_f = &state.entry[menu->current];
         NNTP_DATA *nd;
 
         if (i == OP_CATCHUP)
-          nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name);
+          nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
         else
-          nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, f->name);
+          nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, folder_f->name);
 
         if (nd) {
-/*	    FOLDER folder;
-	    struct folder_file ff;
-	    char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
-	    folder.ff = &ff;
-	    folder.ff->name = f->name;
-	    folder.ff->st = NULL;
-	    folder.ff->is_new = nd->new;
-	    folder.ff->nd = nd;
-	    p_delete(&f->desc);
-	    mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
-		  newsgroup_format_str, (unsigned long) &folder,
-		  M_FORMAT_ARROWCURSOR);
-	    f->desc = m_strdup(buffer); */
           if (menu->current + 1 < menu->max)
             menu->current++;
           menu->redraw = REDRAW_MOTION_RESYNCH;
@@ -1448,29 +1420,14 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         }
 
         for (; j < state.entrylen; j++) {
-          struct folder_file *f = &state.entry[j];
+          struct folder_file *folderf = &state.entry[j];
 
           if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
-              regexec (rx, f->name, 0, NULL, 0) == 0) {
+              regexec (rx, folderf->name, 0, NULL, 0) == 0) {
             if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
-              nd = mutt_newsgroup_subscribe (news, f->name);
+              nd = mutt_newsgroup_subscribe (news, folderf->name);
             else
-              nd = mutt_newsgroup_unsubscribe (news, f->name);
-/*	      if (nd)
-	      {
-		FOLDER folder;
-		char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
-		folder.name = f->name;
-		folder.f = NULL;
-		folder.new = nd->new;
-		folder.nd = nd;
-		p_delete(&f->desc);
-		mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
-			newsgroup_format_str, (unsigned long) &folder,
-			M_FORMAT_ARROWCURSOR);
-		f->desc = m_strdup(buffer);
-	      } */
+              nd = mutt_newsgroup_unsubscribe (news, folderf->name);
           }
           if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
             if (menu->current + 1 < menu->max)