X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=a9437dd0d68702eda99c2897dc05793599903912;hp=69351d08aa613e789f93960f4ecfb5c20701901a;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/browser.c b/browser.c
index 69351d0..a9437dd 100644
--- a/browser.c
+++ b/browser.c
@@ -7,43 +7,28 @@
  * 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 <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 <dirent.h>
+#include <pwd.h>
+#include <grp.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "buffy.h"
 #include "sort.h"
 #include "browser.h"
 #include "attach.h"
 
 #include <imap/imap.h>
-#include <imap/mx_imap.h>
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
-#include "sidebar.h"
-
-#include "lib/list.h"
-
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
 
 static struct mapping_t FolderHelp[] = {
   {N_("Exit"), OP_EXIT},
@@ -488,7 +473,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 */
@@ -547,14 +532,14 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 
       i = buffy_lookup (buffer);
 #ifdef USE_NNTP
-      add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+      add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? Incoming.arr[i]->new : 0);
 #else
-      add_folder (menu, state, de->d_name, &s, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+      add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0);
 #endif
     }
     closedir (dp);
   }
-  sidebar_draw (CurrentMenu);
+  sidebar_draw ();
   browser_sort (state);
   return 0;
 }
@@ -582,22 +567,22 @@ 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)
+    if (!Incoming.len)
       return (-1);
     buffy_check (0);
 
     init_state (state, menu);
 
-    for (i = 0; i < Incoming->length; i++) {
-      tmp = (BUFFY*) Incoming->data[i];
+    for (i = 0; i < Incoming.len; i++) {
+      tmp = Incoming.arr[i];
       tmp->magic = mx_get_magic (tmp->path);
       if (tmp->magic == M_IMAP) {
 #ifdef USE_NNTP
@@ -1337,7 +1322,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
@@ -1349,29 +1334,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;
@@ -1446,29 +1417,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)