X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=24663cbab2cc3c27d491c506dc77b1168792e713;hp=4d79995e87e0bf51ab47efaa06ea510553abbc32;hb=1ba8fe51b392da2018cdf535389ae5a21f99ce27;hpb=25bf57d598476b329536fa3f748cc0c529fef6bd

diff --git a/buffy.c b/buffy.c
index 4d79995..24663cb 100644
--- a/buffy.c
+++ b/buffy.c
@@ -271,7 +271,7 @@ int mutt_buffy_check (int force)
   struct stat contex_sb;
   time_t now, last1;
   CONTEXT *ctx;
-  int i = 0;
+  int i = 0, local = 0, count = 0;
 #ifdef USE_IMAP
   time_t last2;
 
@@ -303,45 +303,24 @@ int mutt_buffy_check (int force)
   BuffyCount = 0;
   BuffyNotify = 0;
 
-#ifdef USE_IMAP
-  if (!Context || Context->magic != M_IMAP)
-#endif
-#ifdef USE_POP
-    if (!Context || Context->magic != M_POP)
-#endif
-#ifdef USE_NNTP
-      if (!Context || Context->magic != M_NNTP)
-#endif
-        /* check device ID and serial number instead of comparing paths */
-        if (!Context || !Context->path
-            || stat (Context->path, &contex_sb) != 0) {
-          contex_sb.st_dev = 0;
-          contex_sb.st_ino = 0;
-        }
+  count = sidebar_need_count ();
+
+  if (!Context || !Context->path || 
+      (mx_is_local (Context->magic-1) && stat (Context->path, &contex_sb) != 0)) {
+    /* check device ID and serial number instead of comparing paths */
+    contex_sb.st_dev = 0;
+    contex_sb.st_ino = 0;
+  }
 
   for (i = 0; i < Incoming->length; i++) {
     tmp = (BUFFY*) Incoming->data[i];
-#ifdef USE_IMAP
-    if (mx_get_magic (tmp->path) == M_IMAP)
-      tmp->magic = M_IMAP;
-    else
-#endif
-#ifdef USE_POP
-    if (mx_get_magic (tmp->path) == M_IMAP)
-      tmp->magic = M_POP;
-    else
-#endif
-#ifdef USE_NNTP
-    if (mx_get_magic (tmp->path) == M_NNTP)
-      tmp->magic = M_NNTP;
-    else
-#endif
-    if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
-          (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) {
+    tmp->magic = mx_get_magic (tmp->path);
+    local = mx_is_local (tmp->magic-1);
+    if ((tmp->magic <= 0 || local) && (stat (tmp->path, &sb) != 0 || sb.st_size == 0)) {
       /* if the mailbox still doesn't exist, set the newly created flag to
        * be ready for when it does. */
       tmp->newly_created = 1;
-      tmp->magic = 0;
+      tmp->magic = -1;
 #ifdef BUFFY_SIZE
       tmp->size = 0;
 #endif
@@ -350,36 +329,15 @@ int mutt_buffy_check (int force)
 
     /* check to see if the folder is the currently selected folder
      * before polling */
-    if (!Context || !Context->path || ((0
-#ifdef USE_IMAP
-                                        || tmp->magic == M_IMAP
-#endif
-#ifdef USE_POP
-                                        || tmp->magic == M_POP
-#endif
-#ifdef USE_NNTP
-                                        || tmp->magic == M_NNTP
-#endif
-                                       )? safe_strcmp (tmp->path,
-                                                       Context->path) : (sb.
-                                                                         st_dev
-                                                                         !=
-                                                                         contex_sb.
-                                                                         st_dev
-                                                                         ||
-                                                                         sb.
-                                                                         st_ino
-                                                                         !=
-                                                                         contex_sb.
-                                                                         st_ino)
-        )
-      ) {
+    if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
+                                                sb.st_ino != contex_sb.st_ino) :
+                                       safe_strcmp (tmp->path, Context->path))) {
       switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
         /* only check on force or $mail_check reached */
         if (force != 0 || (now - last1 >= BuffyTimeout)) {
-          if (SidebarWidth == 0 || !option (OPTMBOXPANE)) {
+          if (!count) {
             if (STAT_CHECK) {
               BuffyCount++;
               tmp->new = 1;
@@ -391,8 +349,7 @@ int mutt_buffy_check (int force)
             }
 #endif
           }
-          else if (SidebarWidth > 0 && option (OPTMBOXPANE) &&
-                   (STAT_CHECK || tmp->msgcount == 0)) {
+          else if (STAT_CHECK || tmp->msgcount == 0) {
             /* sidebar visible */
             BuffyCount++;
             if ((ctx =
@@ -433,7 +390,7 @@ int mutt_buffy_check (int force)
               if (tmp->new == 0) {
                 BuffyCount++;
                 tmp->new = 1;
-                if (SidebarWidth == 0 || !option (OPTMBOXPANE))
+                if (!count)
                   /* if sidebar invisible -> done */
                   break;
               }
@@ -444,7 +401,7 @@ int mutt_buffy_check (int force)
           }
           closedir (dirp);
 
-          if (SidebarWidth > 0 && option (OPTMBOXPANE)) {
+          if (count) {
             /* only count total mail if sidebar visible */
             snprintf (path, sizeof (path), "%s/cur", tmp->path);
             if ((dirp = opendir (path)) == NULL) {
@@ -476,7 +433,7 @@ int mutt_buffy_check (int force)
         if (force != 0 || (now - last1 >= BuffyTimeout)) {
           if ((tmp->new = mh_buffy (tmp->path)) > 0)
             BuffyCount++;
-          if (SidebarWidth > 0 && option (OPTMBOXPANE)) {
+          if (count) {
             DIR *dp;
             struct dirent *de;
 
@@ -520,15 +477,6 @@ int mutt_buffy_check (int force)
         break;
 #endif
 
-#ifdef USE_POP
-      case M_POP:
-        break;
-#endif
-
-#ifdef USE_NNTP
-      case M_NNTP:
-        break;
-#endif
       }
     }
 #ifdef BUFFY_SIZE