X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=b00170b41df4709d08de275e5155545d6dad8334;hp=6293bbb760c3a4beb81f21cef0ddfb292fad19a8;hb=e745050e2e9e1078a009828ed6db68fd72db771c;hpb=60f4017cfee7116f7945c2945965c0537570a3d3

diff --git a/buffy.c b/buffy.c
index 6293bbb..b00170b 100644
--- a/buffy.c
+++ b/buffy.c
@@ -52,16 +52,16 @@ static short BuffyNotify = 0;   /* # of unnotified new boxes */
 /* Find the last message in the file. 
  * upon success return 0. If no message found - return -1 */
 
-static int fseek_last_message (FILE * f)
+static int fseeko_last_message (FILE * f)
 {
-  long int pos;
+  LOFF_T pos;
   char buffer[BUFSIZ + 9];      /* 7 for "\n\nFrom " */
   int bytes_read;
   int i;                        /* Index into `buffer' for scanning.  */
 
   memset (buffer, 0, sizeof (buffer));
-  fseek (f, 0, SEEK_END);
-  pos = ftell (f);
+  fseeko (f, 0, SEEK_END);
+  pos = ftello (f);
 
   /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 <
    * `bytes_read' <= `BUFSIZ'.  */
@@ -73,13 +73,13 @@ static int fseek_last_message (FILE * f)
   while ((pos -= bytes_read) >= 0) {
     /* we save in the buffer at the end the first 7 chars from the last read */
     strncpy (buffer + BUFSIZ, buffer, 5 + 2);   /* 2 == 2 * str_len(CRLF) */
-    fseek (f, pos, SEEK_SET);
+    fseeko (f, pos, SEEK_SET);
     bytes_read = fread (buffer, sizeof (char), bytes_read, f);
     if (bytes_read == -1)
       return -1;
     for (i = bytes_read; --i >= 0;)
       if (!str_ncmp (buffer + i, "\n\nFrom ", str_len ("\n\nFrom "))) { /* found it - go to the beginning of the From */
-        fseek (f, pos + i + 2, SEEK_SET);
+        fseeko (f, pos + i + 2, SEEK_SET);
         return 0;
       }
     bytes_read = BUFSIZ;
@@ -87,7 +87,7 @@ static int fseek_last_message (FILE * f)
 
   /* here we are at the beginning of the file */
   if (!str_ncmp ("From ", buffer, 5)) {
-    fseek (f, 0, 0);
+    fseeko (f, 0, 0);
     return (0);
   }
 
@@ -101,7 +101,7 @@ static int test_last_status_new (FILE * f)
   ENVELOPE *tmp_envelope;
   int result = 0;
 
-  if (fseek_last_message (f) == -1)
+  if (fseeko_last_message (f) == -1)
     return (0);
 
   hdr = mutt_new_header ();
@@ -201,7 +201,6 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
 
     if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
       list_del (&Incoming, (list_del_t*) buffy_free);
-      sidebar_draw (CurrentMenu);
       return 0;
     }
 
@@ -246,7 +245,6 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
       tmp->size = 0;
 #endif /* BUFFY_SIZE */
   }
-  sidebar_draw (CurrentMenu);
   return 0;
 }
 
@@ -262,7 +260,7 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
 /* values for force:
  * 0    don't force any checks + update sidebar
  * 1    force all checks + update sidebar
- * 2    force all checks + _don't_ update sidebar
+ * 2    don't force any checks + _don't_ update sidebar
  */
 int buffy_check (int force)
 {
@@ -279,7 +277,7 @@ int buffy_check (int force)
   time_t last2;
 
   /* update postponed count as well, on force */
-  if (force != 0)
+  if (force == 1)
     mutt_update_num_postponed ();
 #endif
 
@@ -296,11 +294,11 @@ int buffy_check (int force)
     return BuffyCount;
 
   last1 = BuffyTime;
-  if (force != 0 || now - BuffyTime >= BuffyTimeout)
+  if (force == 1 || now - BuffyTime >= BuffyTimeout)
     BuffyTime = now;
 #ifdef USE_IMAP
   last2 = ImapBuffyTime;
-  if (force != 0 || now - ImapBuffyTime >= ImapBuffyTimeout)
+  if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
     ImapBuffyTime = now;
 #endif
   BuffyCount = 0;
@@ -339,7 +337,7 @@ int buffy_check (int force)
       case M_MBOX:
       case M_MMDF:
         /* only check on force or $mail_check reached */
-        if (force != 0 || (now - last1 >= BuffyTimeout)) {
+        if (force == 1 || (now - last1 >= BuffyTimeout)) {
           if (!count) {
             if (STAT_CHECK) {
               BuffyCount++;
@@ -375,7 +373,7 @@ int buffy_check (int force)
 
       case M_MAILDIR:
         /* only check on force or $mail_check reached */
-        if (force != 0 || (now - last1 >= BuffyTimeout)) {
+        if (force == 1 || (now - last1 >= BuffyTimeout)) {
           snprintf (path, sizeof (path), "%s/new", tmp->path);
           if ((dirp = opendir (path)) == NULL) {
             tmp->magic = 0;
@@ -392,10 +390,11 @@ int buffy_check (int force)
               /* one new and undeleted message is enough */
               if (tmp->new == 0) {
                 BuffyCount++;
-                tmp->new = 1;
-                if (!count)
+                if (!count) {
                   /* if sidebar invisible -> done */
+                  tmp->new = 1;
                   break;
+                }
               }
               tmp->msgcount++;
               tmp->msg_unread++;
@@ -433,7 +432,7 @@ int buffy_check (int force)
 
       case M_MH:
         /* only check on force or $mail_check reached */
-        if (force != 0 || (now - last1 >= BuffyTimeout)) {
+        if (force == 1 || (now - last1 >= BuffyTimeout)) {
           if ((tmp->new = mh_buffy (tmp->path)) > 0)
             BuffyCount++;
           if (count) {
@@ -463,16 +462,16 @@ int buffy_check (int force)
 #ifdef USE_IMAP
       case M_IMAP:
         /* only check on force or $imap_mail_check reached */
-        if (force != 0 || (now - last2 >= ImapBuffyTimeout)) {
+        if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
           tmp->msgcount = imap_mailbox_check (tmp->path, 0);
-          if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
+          tmp->new = imap_mailbox_check (tmp->path, 1);
+          tmp->msg_unread = imap_mailbox_check (tmp->path, 2);
+          if (tmp->new > 0)
             BuffyCount++;
-            tmp->msg_unread = tmp->new; /* for sidebar; wtf? */
-          }
-          else {
+          else
             tmp->new = 0;
+          if (tmp->msg_unread < 0)
             tmp->msg_unread = 0;
-          }
         }
         else if (tmp->new > 0)
           /* keep current stats if !force and !$imap_mail_check reached */