We want to initialize shorthost before hostname.

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index d945b89..25bd7f0 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -370,11 +370,11 @@ newsgroup_format_str(char *dest, ssize_t destlen, char op,
       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) {
+             folder->ff->nd->lastCached >= folder->ff->nd->first &&
+             folder->ff->nd->lastCached <= folder->ff->nd->last) {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
       snprintf (dest, destlen, tmp,
-                folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
+                folder->ff->nd->last - folder->ff->nd->lastCached);
     }
     else {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@ -428,7 +428,7 @@ static void add_folder (MUTTMENU * m, struct browser_state *state,
   (state->entry)[state->entrylen].imap = 0;
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    (state->entry)[state->entrylen].nd = (nntp_data_t *) data;
+    (state->entry)[state->entrylen].nd = data;
 #endif
   (state->entrylen)++;
 }
@@ -450,7 +450,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 #ifdef USE_NNTP
   if (option (OPTNEWS)) {
     nntp_data_t *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
+    nntp_server_t *news = CurrentNewsSrv;
 
 /*  buffy_check (0); */
     init_state (state, menu);
@@ -542,7 +542,7 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
 #ifdef USE_NNTP
   if (option (OPTNEWS)) {
     nntp_data_t *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
+    nntp_server_t *news = CurrentNewsSrv;
 
 /*  buffy_check (0); */
     init_state (state, menu);
@@ -1366,7 +1366,7 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         char *s = buf;
         int j = menu->current;
         nntp_data_t *nd;
-        NNTP_SERVER *news = CurrentNewsSrv;
+        nntp_server_t *news = CurrentNewsSrv;
 
         if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) {
           char tmp[STRING];
@@ -1428,7 +1428,6 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
           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);