X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=80756558fbb596a431a19aae5c3eb67dcece7241;hp=b135b33ae16adfc38f9803c82178bd18c609e361;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b

diff --git a/browser.c b/browser.c
index b135b33..8075655 100644
--- a/browser.c
+++ b/browser.c
@@ -13,10 +13,8 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -26,30 +24,6 @@
 #include "attach.h"
 
 #include <imap/imap.h>
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-static struct mapping_t FolderHelp[] = {
-  {N_("Exit"), OP_EXIT},
-  {N_("Chdir"), OP_CHANGE_DIRECTORY},
-  {N_("Mask"), OP_ENTER_MASK},
-  {N_("Help"), OP_HELP},
-  {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t FolderNewsHelp[] = {
-  {N_("Exit"), OP_EXIT},
-  {N_("List"), OP_TOGGLE_MAILBOXES},
-  {N_("Subscribe"), OP_BROWSER_SUBSCRIBE},
-  {N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE},
-  {N_("Catchup"), OP_CATCHUP},
-  {N_("Mask"), OP_ENTER_MASK},
-  {N_("Help"), OP_HELP},
-  {NULL, OP_NULL}
-};
-#endif
 
 typedef struct folder_t {
   struct folder_file *ff;
@@ -65,9 +39,9 @@ static void destroy_state (struct browser_state *state)
   int c;
 
   for (c = 0; c < state->entrylen; c++) {
-    p_delete(&((state->entry)[c].name));
-    p_delete(&((state->entry)[c].desc));
-    p_delete(&((state->entry)[c].st));
+    p_delete(&state->entry[c].name);
+    p_delete(&state->entry[c].desc);
+    p_delete(&state->entry[c].st);
   }
   p_delete(&state->folder);
   p_delete(&state->entry);
@@ -111,17 +85,9 @@ static void browser_sort (struct browser_state *state)
   case SORT_ORDER:
     return;
   case SORT_DATE:
-#ifdef USE_NNTP
-    if (option (OPTNEWS))
-      return;
-#endif
     f = browser_compare_date;
     break;
   case SORT_SIZE:
-#ifdef USE_NNTP
-    if (option (OPTNEWS))
-      return;
-#endif
     f = browser_compare_size;
     break;
   case SORT_SUBJECT:
@@ -145,11 +111,11 @@ static int link_is_dir (const char *folder, const char *path)
     return 0;
 }
 
-static const char *folder_format_str (char *dest, ssize_t destlen, char op,
-                                      const char *src, const char *fmt,
-                                      const char *ifstr,
-                                      const char *elstr,
-                                      anytype data, format_flag flags)
+static const char *
+folder_format_str(char *dest, ssize_t destlen, char op,
+                  const char *src, const char *fmt,
+                  const char *ifstr, const char *elstr,
+                  anytype data, format_flag flags)
 {
   char fn[STRING], tmp[STRING], permission[11], date[16];
   const char *t_fmt;
@@ -184,9 +150,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
       const char *s;
 
       if (folder->ff->imap)
-        s = NONULL (folder->ff->desc);
+        s = NONULL(folder->ff->desc);
       else
-        s = NONULL (folder->ff->name);
+        s = NONULL(folder->ff->name);
 
       snprintf (fn, sizeof (fn), "%s%s", s,
                 folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
@@ -200,9 +166,8 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
   case 'F':
     if (folder->ff->st != NULL) {
       snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
-                S_ISDIR (folder->ff->st->
-                         st_mode) ? 'd' : (S_ISLNK (folder->ff->st->
-                                                    st_mode) ? 'l' : '-'),
+                S_ISDIR(folder->ff->st-> st_mode)
+                ? 'd' : (S_ISLNK(folder->ff->st-> st_mode) ? 'l' : '-'),
                 (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-',
                 (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
                 (folder->ff->st->st_mode & S_ISUID) !=
@@ -302,111 +267,15 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
 
 
   if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, optional ? ifstr : elstr, folder_format_str,
-                data, 0);
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                folder_format_str, data, 0);
 
   return src;
 }
 
-#ifdef USE_NNTP
-static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
-                                         const char *src, const char *fmt,
-                                         const char *ifstr,
-                                         const char *elstr,
-                                         anytype data, format_flag flags)
-{
-  char fn[STRING], tmp[STRING];
-  FOLDER *folder = data.ptr;
-
-  switch (op) {
-  case 'C':
-    snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-    snprintf (dest, destlen, tmp, folder->num + 1);
-    break;
-
-  case 'f':
-    m_strcpy(fn, sizeof(fn), folder->ff->name);
-    snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-    snprintf (dest, destlen, tmp, fn);
-    break;
-
-  case 'N':
-    snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
-    if (folder->ff->nd->subscribed)
-      snprintf (dest, destlen, tmp, ' ');
-    else
-      snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : 'u');
-    break;
-
-  case 'M':
-    snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
-    if (folder->ff->nd->deleted)
-      snprintf (dest, destlen, tmp, 'D');
-    else
-      snprintf (dest, destlen, tmp, folder->ff->nd->allowed ? ' ' : '-');
-    break;
-
-  case 's':
-    if (flags & M_FORMAT_OPTIONAL) {
-      if (folder->ff->nd->unread != 0)
-        m_strformat (dest, destlen, ifstr, newsgroup_format_str,
-                           data, flags);
-      else
-        m_strformat (dest, destlen, elstr, newsgroup_format_str,
-                           data, flags);
-    }
-    else if (Context && Context->data == folder->ff->nd) {
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp, Context->unread);
-    }
-    else {
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp, folder->ff->nd->unread);
-    }
-    break;
-
-  case 'n':
-    if (Context && Context->data == folder->ff->nd) {
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp, Context->new);
-    }
-    else if (option (OPTMARKOLD) &&
-             folder->ff->nd->lastCached >= folder->ff->nd->firstMessage &&
-             folder->ff->nd->lastCached <= folder->ff->nd->lastMessage) {
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp,
-                folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
-    }
-    else {
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp, folder->ff->nd->unread);
-    }
-    break;
-
-  case 'd':
-    if (folder->ff->nd->desc != NULL) {
-      snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-      snprintf (dest, destlen, tmp, folder->ff->nd->desc);
-    }
-    else {
-      snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-      snprintf (dest, destlen, tmp, "");
-    }
-    break;
-  }
-  return (src);
-}
-#endif /* USE_NNTP */
 
-#ifdef USE_NNTP
-static void add_folder (MUTTMENU * m, struct browser_state *state,
-                        const char *name, const struct stat *s,
-                        void *data, int new)
-#else
 static void add_folder (MUTTMENU * m, struct browser_state *state,
-                        const char *name, const struct stat *s,
-                        int new)
-#endif
+                        const char *name, const struct stat *s, int new)
 {
   if (state->entrylen == state->entrymax) {
     /* need to allocate more space */
@@ -427,10 +296,6 @@ static void add_folder (MUTTMENU * m, struct browser_state *state,
   (state->entry)[state->entrylen].name = m_strdup(name);
   (state->entry)[state->entrylen].desc = m_strdup(name);
   (state->entry)[state->entrylen].imap = 0;
-#ifdef USE_NNTP
-  if (option (OPTNEWS))
-    (state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
-#endif
   (state->entrylen)++;
 }
 
@@ -448,94 +313,62 @@ static void init_state (struct browser_state *state, MUTTMENU * menu)
 static int examine_directory (MUTTMENU * menu, struct browser_state *state,
                               char *d, const char *prefix)
 {
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    string_list_t *tmp;
-    NNTP_DATA *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
-
-/*  buffy_check (0); */
-    init_state (state, menu);
-
-    for (tmp = news->list; tmp; tmp = tmp->next) {
-      if (!(data = (NNTP_DATA *) tmp->data))
-        continue;
-      nntp_sync_sidebar (data);
-      if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
-        continue;
-      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
+ 
+  struct stat s;
+  DIR *dp;
+  struct dirent *de;
+  char buffer[_POSIX_PATH_MAX + STRING];
+  int i = -1;
+
+  while (stat (d, &s) == -1) {
+    if (errno == ENOENT) {
+      /* The last used directory is deleted, try to use the parent dir. */
+      char *c = strrchr (d, '/');
+
+      if (c && (c > d)) {
+        *c = 0;
         continue;
-#ifdef USE_NNTP
-      add_folder (menu, state, data->group, NULL, data, data->new);
-#else
-      add_folder (menu, state, data->group, NULL, data->new);
-#endif
-    }
-    sidebar_draw ();
-  }
-  else
-#endif /* USE_NNTP */
-  {
-    struct stat s;
-    DIR *dp;
-    struct dirent *de;
-    char buffer[_POSIX_PATH_MAX + STRING];
-    int i = -1;
-
-    while (stat (d, &s) == -1) {
-      if (errno == ENOENT) {
-        /* The last used directory is deleted, try to use the parent dir. */
-        char *c = strrchr (d, '/');
-
-        if (c && (c > d)) {
-          *c = 0;
-          continue;
-        }
       }
-      mutt_perror (d);
-      return (-1);
     }
+    mutt_perror (d);
+    return (-1);
+  }
 
-    if (!S_ISDIR (s.st_mode)) {
-      mutt_error (_("%s is not a directory."), d);
-      return (-1);
-    }
+  if (!S_ISDIR (s.st_mode)) {
+    mutt_error (_("%s is not a directory."), d);
+    return (-1);
+  }
 
-    buffy_check (0);
+  buffy_check (0);
 
-    if ((dp = opendir (d)) == NULL) {
-      mutt_perror (d);
-      return (-1);
-    }
+  if ((dp = opendir (d)) == NULL) {
+    mutt_perror (d);
+    return (-1);
+  }
 
-    init_state (state, menu);
+  init_state (state, menu);
 
-    while ((de = readdir (dp)) != NULL) {
-      if (m_strcmp(de->d_name, ".") == 0)
-        continue;               /* we don't need . */
+  while ((de = readdir (dp)) != NULL) {
+    if (m_strcmp(de->d_name, ".") == 0)
+      continue;               /* we don't need . */
 
-      if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
-        continue;
-      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
-        continue;
+    if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
+      continue;
+    if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg))
+      continue;
 
-      mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
-      if (lstat (buffer, &s) == -1)
-        continue;
+    mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
+    if (lstat (buffer, &s) == -1)
+      continue;
 
-      if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) &&
-          (!S_ISLNK (s.st_mode)))
-        continue;
+    if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) &&
+        (!S_ISLNK (s.st_mode)))
+      continue;
 
-      i = buffy_lookup (buffer);
-#ifdef USE_NNTP
-      add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? Incoming.arr[i]->new : 0);
-#else
-      add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0);
-#endif
-    }
-    closedir (dp);
+    i = buffy_lookup (buffer);
+    add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0);
   }
+  closedir (dp);
   sidebar_draw ();
   browser_sort (state);
   return 0;
@@ -546,91 +379,44 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
 {
   struct stat s;
   char buffer[LONG_STRING];
+  int i = 0;
+  BUFFY* tmp;
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    string_list_t *tmp;
-    NNTP_DATA *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
+  if (!Incoming.len)
+    return (-1);
+  buffy_check (0);
 
-/*  buffy_check (0); */
-    init_state (state, menu);
+  init_state (state, menu);
 
-    for (tmp = news->list; tmp; tmp = tmp->next) {
-      if ((data = (NNTP_DATA*) tmp->data) == NULL)
-        continue;
-      nntp_sync_sidebar (data);
-      if ((data->new || (data->subscribed && 
-                         (!option (OPTSHOWONLYUNREAD)|| data->unread))))
-        add_folder (menu, state, data->group, NULL, data, data->new);
+  for (i = 0; i < Incoming.len; i++) {
+    tmp = Incoming.arr[i];
+    tmp->magic = mx_get_magic (tmp->path);
+    if (tmp->magic == M_IMAP) {
+      add_folder (menu, state, tmp->path, NULL, tmp->new);
+      continue;
     }
-    sidebar_draw ();
-  }
-  else
-#endif
-  {
-    int i = 0;
-    BUFFY* tmp;
-
-    if (!Incoming.len)
-      return (-1);
-    buffy_check (0);
-
-    init_state (state, menu);
-
-    for (i = 0; i < Incoming.len; i++) {
-      tmp = Incoming.arr[i];
-      tmp->magic = mx_get_magic (tmp->path);
-      if (tmp->magic == M_IMAP) {
-#ifdef USE_NNTP
-        add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
-#else
-        add_folder (menu, state, tmp->path, NULL, tmp->new);
-#endif
-        continue;
-      }
-      if (tmp->magic == M_POP) {
-#ifdef USE_NNTP
-        add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
-#else
-        add_folder (menu, state, tmp->path, NULL, tmp->new);
-#endif
-        continue;
-      }
-#ifdef USE_NNTP
-      if (tmp->magic == M_NNTP) {
-        add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
-        continue;
-      }
-#endif
-      if (lstat (tmp->path, &s) == -1)
-        continue;
-
-      if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) &&
-          (!S_ISLNK (s.st_mode)))
-        continue;
+    if (tmp->magic == M_POP) {
+      add_folder (menu, state, tmp->path, NULL, tmp->new);
+      continue;
+    }
+    if (lstat (tmp->path, &s) == -1)
+      continue;
 
-      m_strcpy(buffer, sizeof(buffer), NONULL(tmp->path));
-      mutt_pretty_mailbox (buffer);
+    if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) &&
+        (!S_ISLNK (s.st_mode)))
+      continue;
 
-#ifdef USE_NNTP
-      add_folder (menu, state, buffer, &s, NULL, tmp->new);
-#else
-      add_folder (menu, state, buffer, &s, tmp->new);
-#endif
-    }
+    m_strcpy(buffer, sizeof(buffer), NONULL(tmp->path));
+    mutt_pretty_mailbox (buffer);
+    add_folder (menu, state, buffer, &s, tmp->new);
   }
+
   browser_sort (state);
   return 0;
 }
 
 static int select_file_search (MUTTMENU * menu, regex_t * re, int n)
 {
-#ifdef USE_NNTP
-  if (option (OPTNEWS))
-    return (regexec
-            (re, ((struct folder_file *) menu->data)[n].desc, 0, NULL, 0));
-#endif
   return (regexec
           (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0));
 }
@@ -642,14 +428,8 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
   folder.ff = &((struct folder_file *) menu->data)[num];
   folder.num = num;
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS))
-    m_strformat(s, slen, GroupFormat, newsgroup_format_str, &folder,
-                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
-  else
-#endif
-    m_strformat(s, slen, FolderFormat, folder_format_str, &folder,
-               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+  m_strformat(s, slen, getmaxx(main_w), FolderFormat, folder_format_str,
+              &folder, 0);
 }
 
 static void init_menu (struct browser_state *state, MUTTMENU * menu,
@@ -668,16 +448,6 @@ static void init_menu (struct browser_state *state, MUTTMENU * menu,
 
   menu->tagged = 0;
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    if (buffy)
-      snprintf (title, titlelen, "%s", _("Subscribed newsgroups"));
-    else
-      snprintf (title, titlelen, _("Newsgroups on server [%s]"),
-                CurrentNewsSrv->conn->account.host);
-  }
-  else
-#endif
   if (buffy)
     snprintf(title, titlelen, _("Mailboxes [%d]"), buffy_check(0));
   else {
@@ -711,12 +481,11 @@ static int file_tag (MUTTMENU * menu, int n, int m)
   return ff->tagged - ot;
 }
 
-void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
-                        int *numfiles)
+void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
+                       int *numfiles)
 {
   char buf[_POSIX_PATH_MAX];
   char prefix[_POSIX_PATH_MAX] = "";
-  char helpstr[STRING];
   char title[STRING];
   struct browser_state state;
   MUTTMENU *menu;
@@ -733,27 +502,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
   if (!folder)
     m_strcpy(LastDirBackup, sizeof(LastDirBackup), LastDir);
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    if (*f)
-      m_strcpy(prefix, sizeof(prefix), f);
-    else {
-      string_list_t *list;
-
-      /* default state for news reader mode is browse subscribed newsgroups */
-      buffy = 0;
-      for (list = CurrentNewsSrv->list; list; list = list->next) {
-        NNTP_DATA *data = (NNTP_DATA *) list->data;
-
-        if (data && data->subscribed) {
-          buffy = 1;
-          break;
-        }
-      }
-    }
-  }
-  else
-#endif
   if (*f) {
     mutt_expand_path (f, flen);
     if (imap_is_magic (f, NULL) == M_IMAP) {
@@ -822,13 +570,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
   menu->data = state.entry;
   if (multiple)
     menu->tag = file_tag;
-
-  menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
-#ifdef USE_NNTP
-                                  (option (OPTNEWS)) ? FolderNewsHelp :
-#endif
-                                  FolderHelp);
-
   init_menu (&state, menu, title, sizeof (title), buffy);
 
   for (;;) {
@@ -931,7 +672,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
             /* try to restore the old values */
             m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
             if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-              m_strcpy(LastDir, sizeof(LastDir), NONULL(Homedir));
+              m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir));
               goto bail;
             }
           }
@@ -942,12 +683,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         }
       }
 
-#ifdef USE_NNTP
-      if (buffy || option (OPTNEWS))    /* news have not path */
-#else
-      if (buffy)
-#endif
-      {
+      if (buffy) {
         m_strcpy(f, flen, state.entry[menu->current].name);
         mutt_expand_path (f, flen);
       }
@@ -1084,12 +820,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       break;
 
     case OP_CHANGE_DIRECTORY:
-
-#ifdef USE_NNTP
-      if (option (OPTNEWS))
-        break;
-#endif
-
       m_strcpy(buf, sizeof(buf), LastDir);
       if (!state.imap_browse)
       {
@@ -1149,7 +879,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
         regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
-        int not = 0, err;
+        int neg = 0, err;
 
         buffy = 0;
         /* assume that the user wants to see everything */
@@ -1158,7 +888,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         s = vskipspaces(s);
         if (*s == '!') {
           s = vskipspaces(s + 1);
-          not = 1;
+          neg = 1;
         }
 
         if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
@@ -1172,7 +902,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
           regfree (Mask.rx);
           p_delete(&Mask.rx);
           Mask.rx = rx;
-          Mask.not = not;
+          Mask.neg = neg;
 
           destroy_state (&state);
           if (state.imap_browse) {
@@ -1327,139 +1057,12 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       }
       break;
 
-#ifdef USE_NNTP
-    case OP_CATCHUP:
-    case OP_UNCATCHUP:
-      if (option (OPTNEWS)) {
-        struct folder_file *folder_f = &state.entry[menu->current];
-        NNTP_DATA *nd;
-
-        if (i == OP_CATCHUP)
-          nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
-        else
-          nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, folder_f->name);
-
-        if (nd) {
-          if (menu->current + 1 < menu->max)
-            menu->current++;
-          menu->redraw = REDRAW_MOTION_RESYNCH;
-        }
-      }
-      break;
-
-    case OP_LOAD_ACTIVE:
-      if (!option (OPTNEWS))
-        break;
-
-      {
-        string_list_t *tmp;
-        NNTP_DATA *data;
-
-        for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) {
-          if ((data = (NNTP_DATA *) tmp->data))
-            data->deleted = 1;
-        }
-      }
-      nntp_get_active (CurrentNewsSrv);
-
-      destroy_state (&state);
-      if (buffy)
-        examine_mailboxes (menu, &state);
-      else
-        examine_directory (menu, &state, NULL, NULL);
-      init_menu (&state, menu, title, sizeof (title), buffy);
-      break;
-#endif /* USE_NNTP */
-
     case OP_BROWSER_SUBSCRIBE:
     case OP_BROWSER_UNSUBSCRIBE:
-#ifdef USE_NNTP
-    case OP_SUBSCRIBE_PATTERN:
-    case OP_UNSUBSCRIBE_PATTERN:
-      if (option (OPTNEWS)) {
-        regex_t *rx = p_new(regex_t, 1);
-        char *s = buf;
-        int j = menu->current;
-        NNTP_DATA *nd;
-        NNTP_SERVER *news = CurrentNewsSrv;
-
-        if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) {
-          char tmp[STRING];
-          int err;
-
-          buf[0] = 0;
-          if (i == OP_SUBSCRIBE_PATTERN)
-            snprintf (tmp, sizeof (tmp), _("Subscribe pattern: "));
-          else
-            snprintf (tmp, sizeof (tmp), _("Unsubscribe pattern: "));
-          if (mutt_get_field (tmp, buf, sizeof (buf), 0) != 0 || !buf[0]) {
-            p_delete(&rx);
-            break;
-          }
-
-          if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
-            regerror (err, rx, buf, sizeof (buf));
-            regfree (rx);
-            p_delete(&rx);
-            mutt_error ("%s", buf);
-            break;
-          }
-          menu->redraw = REDRAW_FULL;
-          j = 0;
-        }
-        else if (!state.entrylen) {
-          mutt_error _("No newsgroups match the mask");
-
-          break;
-        }
-
-        for (; j < state.entrylen; j++) {
-          struct folder_file *folderf = &state.entry[j];
-
-          if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
-              regexec (rx, folderf->name, 0, NULL, 0) == 0) {
-            if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
-              nd = mutt_newsgroup_subscribe (news, folderf->name);
-            else
-              nd = mutt_newsgroup_unsubscribe (news, folderf->name);
-          }
-          if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
-            if (menu->current + 1 < menu->max)
-              menu->current++;
-            menu->redraw = REDRAW_MOTION_RESYNCH;
-            break;
-          }
-        }
-        if (i == OP_SUBSCRIBE_PATTERN) {
-          string_list_t *grouplist = NULL;
-
-          if (news)
-            grouplist = news->list;
-          for (; grouplist; grouplist = grouplist->next) {
-            nd = (NNTP_DATA *) grouplist->data;
-            if (nd && nd->group && !nd->subscribed) {
-              if (regexec (rx, nd->group, 0, NULL, 0) == 0) {
-                mutt_newsgroup_subscribe (news, nd->group);
-                add_folder (menu, &state, nd->group, NULL, nd, nd->new);
-              }
-            }
-          }
-          init_menu (&state, menu, title, sizeof (title), buffy);
-        }
-        mutt_newsrc_update (news);
-        nntp_clear_cacheindex (news);
-        if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
-          regfree (rx);
-        p_delete(&rx);
-      }
+      if (i == OP_BROWSER_SUBSCRIBE)
+        imap_subscribe (state.entry[menu->current].name, 1);
       else
-#endif /* USE_NNTP */
-      {
-        if (i == OP_BROWSER_SUBSCRIBE)
-          imap_subscribe (state.entry[menu->current].name, 1);
-        else
-          imap_subscribe (state.entry[menu->current].name, 0);
-      }
+        imap_subscribe (state.entry[menu->current].name, 0);
     }
   }