X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=0db6026e5ef74d432c7e17c98bcb80c8510a753a;hp=6dd5457d0b1d12dfb5513be64fec2e40299c0167;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=22601f25ede6703ba7cd06ee84eddd2045308570

diff --git a/buffy.c b/buffy.c
index 6dd5457..0db6026 100644
--- a/buffy.c
+++ b/buffy.c
@@ -10,13 +10,12 @@
  * 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 <dirent.h>
+#include <utime.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
 
 #include <imap/imap.h>
 
@@ -24,18 +23,6 @@
 #include "buffy.h"
 #include "mx.h"
 #include "mh.h"
-#include "sidebar.h"
-
-#include "mutt_curses.h"
-
-#include <string.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <utime.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <stdio.h>
 
 static time_t BuffyTime = 0;    /* last time we started checking for mail */
 
@@ -171,7 +158,7 @@ static void buffy_free (BUFFY** p) {
 }
 
 int buffy_lookup (const char* path) {
-  unsigned int i = 0;
+  int i = 0;
   if (list_empty(Incoming) || !path || !*path)
     return (-1);
   for (i = 0; i < Incoming->length; i++) {
@@ -268,7 +255,7 @@ int buffy_check (int force)
   struct stat contex_sb;
   time_t now, last1;
   CONTEXT *ctx;
-  unsigned int i = 0;
+  int i = 0;
   int local = 0, count = 0;
   time_t last2;
 
@@ -321,7 +308,7 @@ int buffy_check (int force)
      * before polling */
     if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
                                                 sb.st_ino != contex_sb.st_ino) : 
-                                       !m_strcmp(tmp->path, Context->path))) {
+                                       m_strcmp(tmp->path, Context->path))) {
       switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
@@ -491,7 +478,7 @@ int buffy_list (void)
   int pos;
   int first;
   int have_unnotified = BuffyNotify;
-  unsigned int i = 0;
+  int i = 0;
 
   pos = 0;
   first = 1;
@@ -555,7 +542,7 @@ int buffy_notify (void)
  */
 void buffy_next (char *s, size_t slen)
 {
-  unsigned int l = 0;
+  int l = 0;
   int c = 0, i = 0;
 
   if (list_empty(Incoming))