Rocco Rutte:

- revert overly eager header caching change specific to mutt-ng (caches must be rebuild again from scratch)
- fix copy'n'pase error of displaying messages twice

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@362 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/UPGRADING b/UPGRADING
index dd004dc..b105417 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -10,6 +10,12 @@ This document is not the place for verbose documentation; it only offers
 the necessary keywords to look them up in the manual, ChangeLog or other
 sources of information.
 
 the necessary keywords to look them up in the manual, ChangeLog or other
 sources of information.
 

+2005-07-28:
+
+  Because of reverting a (overly eager) mutt-ng-specific issue with
+  header caching, starting with revision 362, all caches must be removed
+  and rebuild again. Sorry for that.
+

 2005-07-25:
 
   Due to changes to internal structures introduced in SVN revision 344,
 2005-07-25:
 
   Due to changes to internal structures introduced in SVN revision 344,

diff --git a/curs_main.c b/curs_main.c
index 42943c5..3fe1af9 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -1298,10 +1298,6 @@ int mutt_index_menu (void)
       if (option (OPTPGPAUTODEC) && 
           (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
         mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
       if (option (OPTPGPAUTODEC) && 
           (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
         mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);

-      if ((op = mutt_display_message (CURHDR)) == -1) {
-        unset_option (OPTNEEDRESORT);
-        break;
-      }

 
       if ((op = mutt_display_message (CURHDR)) == -1) {
         unset_option (OPTNEEDRESORT);
 
       if ((op = mutt_display_message (CURHDR)) == -1) {
         unset_option (OPTNEEDRESORT);

diff --git a/hcache.c b/hcache.c
index f64a601..f6e0d8d 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -387,15 +387,12 @@ static unsigned char *dump_envelope (ENVELOPE * e, unsigned char *d, int *off)
   d = dump_list (e->in_reply_to, d, off);
   d = dump_list (e->userhdrs, d, off);
 
   d = dump_list (e->in_reply_to, d, off);
   d = dump_list (e->userhdrs, d, off);
 

-  d = dump_int (e->irt_changed, d, off);
-  d = dump_int (e->refs_changed, d, off);
-

   return d;
 }
 
 static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
 {
   return d;
 }
 
 static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
 {

-  int tmp = 0;
+  int real_subj_off;

 
   restore_address (&e->return_path, d, off);
   restore_address (&e->from, d, off);
 
   restore_address (&e->return_path, d, off);
   restore_address (&e->from, d, off);


@@ -407,9 +404,9 @@ static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
   restore_address (&e->mail_followup_to, d, off);
 
   restore_char (&e->subject, d, off);
   restore_address (&e->mail_followup_to, d, off);
 
   restore_char (&e->subject, d, off);

-  restore_int ((unsigned int *) (&tmp), d, off);
-  if (0 <= tmp) {
-    e->real_subj = e->subject + tmp;
+  restore_int ((unsigned int *) (&real_subj_off), d, off);
+  if (0 <= real_subj_off) {
+    e->real_subj = e->subject + real_subj_off;

   }
   else {
     e->real_subj = NULL;
   }
   else {
     e->real_subj = NULL;


@@ -429,11 +426,6 @@ static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
   restore_list (&e->references, d, off);
   restore_list (&e->in_reply_to, d, off);
   restore_list (&e->userhdrs, d, off);
   restore_list (&e->references, d, off);
   restore_list (&e->in_reply_to, d, off);
   restore_list (&e->userhdrs, d, off);

-
-  restore_int ((unsigned int *) &tmp, d, off);
-  e->irt_changed = tmp;
-  restore_int ((unsigned int *) &tmp, d, off);
-  e->refs_changed = tmp;

 }
 
 static
 }
 
 static