Changeset 842:e20c4487dc39 for browser.c

Timestamp:

1999-02-09 12:50:36 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Brandon's IMAP clean-up; new czech translation.

Files:

• browser.c (modified) (15 diffs)

browser.c

@@ -24 +24 @@
 #include "sort.h"
 #include "mailbox.h"
+#include "browser.h"
+#ifdef USE_IMAP
+#include "imap.h"
+#endif
 
 #include <stdlib.h>
@@ -33 +37 @@
 #include <pwd.h>
 #include <grp.h>
-
-struct folder_file
-{
-  mode_t mode;
-  time_t mtime;
-  off_t size;
-  char *name;
-  char *desc;
-  short tagged;
-};
-
-struct browser_state
-{
-  struct folder_file *entry;
-  short entrylen; /* number of real entries */
-  short entrymax;  /* max entry */
-};
 
 static struct mapping_t FolderHelp[] = {
@@ -457 +444 @@
     strfcpy (path, LastDir, sizeof (path));
     mutt_pretty_mailbox (path);
+#ifdef USE_IMAP
+  if (state->imap_browse && option (OPTIMAPLSUB))
+    snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
+              path, Mask.pattern);
+  else
+#endif
     snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
               path, Mask.pattern);
@@ -492 +485 @@
   {
     mutt_expand_path (f, flen);
+#ifdef USE_IMAP
+    if (mx_is_imap (f))
+    {
+      init_state (&state, NULL);
+      state.imap_browse = 1;
+      imap_init_browse (f, &state);
+      strfcpy (LastDir, f, sizeof (LastDir));
+    }
+    else
+    {
+#endif
     for (i = mutt_strlen (f) - 1; i > 0 && f[i] != '/' ; i--);
     if (i > 0)
@@ -521 +525 @@
       strfcpy (prefix, f + i + 1, sizeof (prefix));
     killPrefix = 1;
-  }
-  else if (!LastDir[0])
-    strfcpy (LastDir, NONULL(Maildir), sizeof (LastDir));
+#ifdef USE_IMAP
+    }
+#endif
+  }
+  else 
+  {
+    if (!LastDir[0])
+      strfcpy (LastDir, NONULL(Maildir), sizeof (LastDir));
+#ifdef USE_IMAP
+    if (!buffy && mx_is_imap (LastDir))
+    {
+      init_state (&state, NULL);
+      state.imap_browse = 1;
+      imap_init_browse (LastDir, &state);
+    }
+#endif
+  }
 
   *f = 0;
@@ -532 +550 @@
       return;
   }
-  else if (examine_directory (NULL, &state, LastDir, prefix) == -1)
+  else
+#ifdef USE_IMAP
+  if (!state.imap_browse)
+#endif
+  if (examine_directory (NULL, &state, LastDir, prefix) == -1)
     return;
 
@@ -562 +584 @@
         if (S_ISDIR (state.entry[menu->current].mode) ||
             (S_ISLNK (state.entry[menu->current].mode) &&
-            link_is_dir (state.entry[menu->current].name)))
+            link_is_dir (state.entry[menu->current].name)) 
+#ifdef USE_IMAP
+            || state.entry[menu->current].notfolder
+#endif
+            )
         {
           /* make sure this isn't a MH or maildir mailbox */
@@ -570 +596 @@
             mutt_expand_path (buf, sizeof (buf));
           }
+#ifdef USE_IMAP
+          else if (state.imap_browse)
+          {
+            strfcpy (buf, state.entry[menu->current].name, sizeof (buf));
+          }
+#endif
           else
             snprintf (buf, sizeof (buf), "%s/%s", LastDir, 
                       state.entry[menu->current].name);
 
-          if (mx_get_magic (buf) <= 0)
+          if ((mx_get_magic (buf) <= 0)
+#ifdef USE_IMAP
+            || state.entry[menu->current].notfolder
+#endif
+            )
           {
             char OldLastDir[_POSIX_PATH_MAX];
@@ -605 +641 @@
               mutt_expand_path (LastDir, sizeof (LastDir));
             }
+#ifdef USE_IMAP
+            else if (state.imap_browse)
+            {
+              strfcpy (LastDir, state.entry[menu->current].name, 
+                  sizeof (LastDir));
+            }
+#endif
             else
               sprintf (LastDir + mutt_strlen (LastDir), "/%s",
@@ -616 +659 @@
             }
             buffy = 0;
+#ifdef USE_IMAP
+            if (state.imap_browse)
+            {
+              init_state (&state, NULL);
+              state.imap_browse = 1;
+              imap_init_browse (LastDir, &state);
+              menu->data = state.entry;
+            }
+            else
+#endif
             if (examine_directory (menu, &state, LastDir, prefix) == -1)
             {
@@ -638 +691 @@
           mutt_expand_path (f, flen);
         }
+#ifdef USE_IMAP
+        else if (state.imap_browse)
+        {
+          strfcpy (f, state.entry[menu->current].name, flen);
+        }
+#endif
         else
           snprintf (f, flen, "%s/%s", LastDir, state.entry[menu->current].name);
@@ -685 +744 @@
           mutt_message(state.entry[menu->current].name);
         break;
+
+#ifdef USE_IMAP
+      case OP_BROWSER_SUBSCRIBE:
+        imap_subscribe (state.entry[menu->current].name, 1);
+        break;
+
+      case OP_BROWSER_UNSUBSCRIBE:
+        imap_subscribe (state.entry[menu->current].name, 0);
+        break;
+
+      case OP_BROWSER_TOGGLE_LSUB:
+        if (option (OPTIMAPLSUB))
+        {
+          unset_option (OPTIMAPLSUB);
+        }
+        else
+        {
+          set_option (OPTIMAPLSUB);
+        }
+        mutt_ungetch (0, OP_CHECK_NEW);
+        break;
+#endif
       
       case OP_CHANGE_DIRECTORY:
 
         strfcpy (buf, LastDir, sizeof (buf));
+#ifdef USE_IMAP
+        if (!state.imap_browse)
+#endif
         {/* add '/' at the end of the directory name */
         int len=mutt_strlen(LastDir);
@@ -700 +784 @@
           buffy = 0;      
           mutt_expand_path (buf, sizeof (buf));
+#ifdef USE_IMAP
+          if (mx_is_imap (buf))
+          {
+            strfcpy (LastDir, buf, sizeof (LastDir));
+            destroy_state (&state);
+            init_state (&state, NULL);
+            state.imap_browse = 1;
+            imap_init_browse (LastDir, &state);
+            menu->data = state.entry;
+            menu->current = 0; 
+            menu->top = 0; 
+            init_menu (&state, menu, title, sizeof (title), buffy);
+          }
+          else
+#endif
           if (stat (buf, &st) == 0)
           {
@@ -835 +934 @@
         prefix[0] = 0;
         killPrefix = 0;
+
         if (buffy)
         {
@@ -840 +940 @@
             return;
         }
+#ifdef USE_IMAP
+        else if (mx_is_imap (LastDir))
+        {
+          init_state (&state, NULL);
+          state.imap_browse = 1;
+          imap_init_browse (LastDir, &state);
+          menu->data = state.entry;
+        }
+#endif
         else if (examine_directory (menu, &state, LastDir, prefix) == -1)
           return;