Rocco Rutte:

- for <rebuild-cache>, add it to manual tables and don't clean up after run since it's no command line option any longer

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

diff --git a/VERSION.svn b/VERSION.svn
index 75e27a6..0eedeef 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-550
+551

diff --git a/doc/manual.xml.tail b/doc/manual.xml.tail
index 7a53ca1..bbe9d18 100644 (file)
--- a/doc/manual.xml.tail
+++ b/doc/manual.xml.tail
@@ -134,6 +134,11 @@
               <entry><muttng-doc:key>Z</muttng-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
               <entry><muttng-doc:key>Z</muttng-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>

+            <row>
+              <entry><muttng-doc:funcref name="rebuild-cache"/></entry>
+              <entry></entry>
+              <entry>cycle through all defined mailboxes to rebuild all header caches</entry>
+            </row>

             <row>
               <entry><muttng-doc:funcref name="refresh"/></entry>
               <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
             <row>
               <entry><muttng-doc:funcref name="refresh"/></entry>
               <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>

diff --git a/mx.c b/mx.c
index 4bbbaf1..0574fa5 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1439,7 +1439,7 @@ int mx_rebuild_cache (void) {
   mutt_error (_("Support for header caching was not build in."));
   return (1);
 #else
   mutt_error (_("Support for header caching was not build in."));
   return (1);
 #else

-  int i = 0, magic = 0, imap = 0;
+  int i = 0, magic = 0;

   CONTEXT* ctx = NULL;
   char* buf = NULL;
   BUFFY* b = NULL;
   CONTEXT* ctx = NULL;
   char* buf = NULL;
   BUFFY* b = NULL;


@@ -1456,8 +1456,6 @@ int mx_rebuild_cache (void) {
     magic = mx_get_magic (b->path);
     if (magic != M_MAILDIR && magic != M_MH && magic != M_IMAP)
       continue;
     magic = mx_get_magic (b->path);
     if (magic != M_MAILDIR && magic != M_MH && magic != M_IMAP)
       continue;

-    if (magic == M_IMAP)
-      imap = 1;

     buf = str_dup (b->path);
     mutt_pretty_mailbox (buf);
     mutt_message (_("Rebuilding cache for %s..."), buf);
     buf = str_dup (b->path);
     mutt_pretty_mailbox (buf);
     mutt_message (_("Rebuilding cache for %s..."), buf);


@@ -1468,9 +1466,6 @@ int mx_rebuild_cache (void) {
     mem_free (&buf);
   }
 
     mem_free (&buf);
   }
 

-  if (imap)
-    imap_logout_all ();
-

   mutt_clear_error ();
 
   return (0);
   mutt_clear_error ();
 
   return (0);