X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=62474293933902f1ea82b18f0aa5f0faa7747af3;hp=f53dc03bef5891511dcaf08b0849d91fd2cb2d69;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=4c86444ebf9fc4a8231424c0cdd832eb10abdb35

diff --git a/main.c b/main.c
index f53dc03..6247429 100644
--- a/main.c
+++ b/main.c
@@ -45,10 +45,6 @@ extern int optind;
 #include <stringprep.h>
 #endif
 
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
 #ifdef USE_HCACHE
 #if defined(HAVE_QDBM)
 #include <depot.h>
@@ -83,10 +79,6 @@ usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
     puts(_("  -e <command>  specify a command to be executed after initialization"));
     puts(_("  -f <file>     specify which mailbox to read"));
     puts(_("  -F <file>     specify an alternate Madmuttrc file"));
-#ifdef USE_NNTP
-    puts(_("  -g <server>   specify a newsserver"));
-    puts(_("  -G            select a newsgroup"));
-#endif
     puts(_("  -H <file>     specify a draft file to read header and body from"));
     puts(_("  -i <file>     specify a file which Madmutt should include in the body"));
     puts(_("  -n            causes Madmutt not to read the system Madmuttrc"));
@@ -153,11 +145,6 @@ static void show_version (void)
 #else
         "  -USE_HCACHE"
 #endif
-#ifdef USE_NNTP
-        "  +USE_NNTP"
-#else
-        "  -USE_NNTP"
-#endif
 #ifdef HAVE_LIBIDN
         "  +HAVE_LIBIDN"
 #else
@@ -232,11 +219,7 @@ int main (int argc, char **argv)
   srand48 (time (NULL));
   umask (077);
 
-  while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ"
-#ifdef USE_NNTP
-                                                                    "g:G"
-#endif
-                    )) >= 0)
+  while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ")) >= 0)
     switch (i) {
     case 'a':
       if (strlen(optarg)<=512)
@@ -304,20 +287,6 @@ int main (int argc, char **argv)
       flags |= M_SELECT;
       break;
 
-#ifdef USE_NNTP
-    case 'g':                  /* Specify a newsserver */
-      {
-        char buf[LONG_STRING];
-
-        snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg);
-        commands = mutt_add_list (commands, buf);
-      }
-
-    case 'G':                  /* List of newsgroups */
-      flags |= M_SELECT | M_NEWS;
-      break;
-#endif
-
     case 'z':
       flags |= M_IGNORE;
       break;
@@ -511,15 +480,6 @@ int main (int argc, char **argv)
       buffy_next (folder, sizeof (folder));
     }
     else if (flags & M_SELECT) {
-#ifdef USE_NNTP
-      if (flags & M_NEWS) {
-        set_option (OPTNEWS);
-        if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer))) {
-          mutt_endwin (Errorbuf);
-          exit (1);
-        }
-      } else
-#endif
       if (!Incoming.len) {
         mutt_endwin _("No incoming mailboxes defined.");
 
@@ -537,15 +497,7 @@ int main (int argc, char **argv)
     if (!folder[0])
       m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
 
-#ifdef USE_NNTP
-    if (option (OPTNEWS)) {
-      unset_option (OPTNEWS);
-      nntp_expand_path (folder, sizeof (folder),
-                        &CurrentNewsSrv->conn->account);
-    } else
-#endif
-      mutt_expand_path (folder, sizeof (folder));
-
+    mutt_expand_path (folder, sizeof (folder));
     m_strreplace(&CurrentFolder, folder);
     m_strreplace(&LastFolder, folder);