Simplify sidebar code

[apps/madmutt.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index 105e809..4018c5f 100644 (file)
--- 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 */
 
@@ -100,13 +87,13 @@ static int test_last_status_new (FILE * f)
   if (fseeko_last_message (f) == -1)
     return (0);
 
-  hdr = mutt_new_header ();
+  hdr = header_new();
   tmp_envelope = mutt_read_rfc822_header (f, hdr, 0, 0);
   if (!(hdr->read || hdr->old))
     result = 1;
 
-  mutt_free_envelope (&tmp_envelope);
-  mutt_free_header (&hdr);
+  envelope_delete(&tmp_envelope);
+  header_delete(&hdr);
 
   return result;
 }
@@ -165,13 +152,13 @@ void buffy_update_mailbox (BUFFY * b)
 #endif
 
 /* func to free buffy for list_del() */
-static void buffy_free (BUFFY** p) {
+static inline void buffy_free (BUFFY** p) {
   p_delete(&(*p)->path);
   p_delete(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:
@@ -479,7 +466,7 @@ int buffy_check (int force)
     tmp->has_new = tmp->new > 0;
   }
   if (BuffyCount > 0 && force != 2)
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   return (BuffyCount);
 }
 
@@ -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;
@@ -499,7 +486,7 @@ int buffy_list (void)
   pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
   if (Incoming) {
     for (i = 0; i < Incoming->length; i++) {
-      tmp = (BUFFY*) Incoming->data[i];
+      tmp = Incoming->data[i];
       /* Is there new mail in this mailbox? */
       if (tmp->new <= 0 || (have_unnotified && tmp->notified))
         continue;
@@ -513,12 +500,9 @@ int buffy_list (void)
       if (!first)
         pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos));    /* __STRNCAT_CHECKED__ */
 
-      /* Prepend an asterisk to mailboxes not already notified */
-      if (!tmp->notified) {
-        /* pos += m_strlen(strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos));  __STRNCAT_CHECKED__ */
-        tmp->notified = 1;
-        BuffyNotify--;
-      }
+      tmp->notified = 1;
+      BuffyNotify--;
+
       pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos));      /* __STRNCAT_CHECKED__ */
       first = 0;
     }
@@ -528,7 +512,7 @@ int buffy_list (void)
   }
   if (!first) {
     /* on new mail: redraw sidebar */
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
     mutt_message ("%s", buffylist);
     return (1);
   }
@@ -548,24 +532,21 @@ int buffy_notify (void)
 }
 
 /* 
- * mutt_buffy() -- incoming folders completion routine
+ * buffy_next() -- incoming folders completion routine
  *
  * given a folder name, this routine gives the next incoming folder with new
  * new mail.
  */
 void buffy_next (char *s, size_t slen)
 {
-  unsigned int l = 0;
+  int l = 0;
   int c = 0, i = 0;
 
-  if (list_empty(Incoming))
-    return;
-
   mutt_expand_path (s, _POSIX_PATH_MAX);
-  if (buffy_check (0) == 0) {
-    *s = '\0';
-    return;
-  }
+  if (!buffy_check (0)) {
+      *s = '\0';
+      return;
+    }
 
   /*
    * If buffy_lookup returns the index,