X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=32f40c6a6cda6402f2b4bba9f7a2f461826a57cd;hb=e176d53ddc6abf804824cad054a424f45c0a945e;hp=f576fc089ef491935ef50d1ea0a00369d75b807f;hpb=0dbe922d4298aed78dcba64b7c770f315a64505e;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index f576fc0..32f40c6 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -9,35 +9,21 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "mx.h"
 #include "mx_nntp.h"
 #include "nntp.h"
-#include "sidebar.h"
 #include "buffy.h"
 
 #include <lib-crypt/crypt.h>
 
-
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
 #define WANT_LISTGROUP_COMMAND          0
 
 static unsigned int _checked = 0;
@@ -47,7 +33,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   BUFFY* tmp = NULL;
   char buf[STRING];
 
-  if (list_empty (Incoming))
+  if (!Incoming.len)
     return;
 
   /* unfortunately, NNTP_DATA::group only is the plain
@@ -68,7 +54,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   if ((i = buffy_lookup (buf)) < 0)
     return;
 
-  tmp = (BUFFY*) Incoming->data[i];
+  tmp = Incoming.arr[i];
   /* copied from browser.c */
   if (option (OPTMARKOLD) &&
       data->lastCached >= data->firstMessage &&
@@ -1300,7 +1286,7 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force)
       if (l->data && ((NNTP_DATA *) l->data)->subscribed)
         _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else if (!force)
     return 0;