Changeset 2150:40142ff984ca for buffy.c

Timestamp:

2000-10-10 12:22:44 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Vsevolod Volkov's POP mailbox patch.

Files:

• buffy.c (modified) (4 diffs)

buffy.c

@@ -252 +252 @@
   if (!Context || Context->magic != M_IMAP)
 #endif
+#ifdef USE_POP
+  if (!Context || Context->magic != M_POP)
+#endif
   /* check device ID and serial number instead of comparing paths */
   if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
@@ -266 +269 @@
     if ((tmp->magic == M_IMAP) || mx_is_imap (tmp->path))
       tmp->magic = M_IMAP;
+    else
+#endif
+#ifdef USE_POP
+    if ((tmp->magic == M_POP) || mx_is_pop (tmp->path))
+      tmp->magic = M_POP;
     else
 #endif
@@ -283 +291 @@
     /* check to see if the folder is the currently selected folder
      * before polling */
-    if (!Context || !Context->path || 
-#ifdef USE_IMAP
-        (tmp->magic == M_IMAP && mutt_strcmp (tmp->path, Context->path)) ||
-        (tmp->magic != M_IMAP && (
-#endif
-        sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
-#ifdef USE_IMAP
-          ))
-#endif
+    if (!Context || !Context->path ||
+#if defined USE_IMAP || defined USE_POP
+        ((
+#ifdef USE_IMAP
+        tmp->magic == M_IMAP
+#endif
+#ifdef USE_POP
+#ifdef USE_IMAP
+        ||
+#endif
+        tmp->magic == M_POP
+#endif
+        ) ? mutt_strcmp (tmp->path, Context->path) :
+#endif
+        (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)))
     {
       switch (tmp->magic)
@@ -351 +365 @@
         break;
 #endif
+
+#ifdef USE_POP
+      case M_POP:
+        break;
+#endif
       }
     }