X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=6840fb7d6ece0402441e19dff6c502a3263ad704;hp=4a8a2be862551b83e846dd8bb2ad495cf759d2d3;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=d8c2844a5a8b0fcf09158dcdd452f6e43e29b5db

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 4a8a2be..6840fb7 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -12,7 +12,8 @@
 
 #include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
-#include "pop.h"
+#include <lib-mx/pop.h>
+#include <imap/imap.h>
 
 #include "menu.h"
 
@@ -26,8 +27,6 @@
 #include "thread.h"
 #include "score.h"
 
-#include <imap/imap_private.h>
-
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
@@ -156,8 +155,8 @@ static int ci_next_undeleted (int msgno)
 
   for (i = msgno + 1; i < Context->vcount; i++)
     if (!Context->hdrs[Context->v2r[i]]->deleted)
-      return (i);
-  return (-1);
+      return i;
+  return -1;
 }
 
 static int ci_previous_undeleted (int msgno)
@@ -166,8 +165,8 @@ static int ci_previous_undeleted (int msgno)
 
   for (i = msgno - 1; i >= 0; i--)
     if (!Context->hdrs[Context->v2r[i]]->deleted)
-      return (i);
-  return (-1);
+      return i;
+  return -1;
 }
 
 /* Return the index of the first new message, or failing that, the first
@@ -182,13 +181,13 @@ static int ci_first_message (void)
       if (!Context->hdrs[Context->v2r[i]]->read &&
           !Context->hdrs[Context->v2r[i]]->deleted) {
         if (!Context->hdrs[Context->v2r[i]]->old)
-          return (i);
+          return i;
         else if (old == -1)
           old = i;
       }
     }
     if (old != -1)
-      return (old);
+      return old;
 
     /* If Sort is reverse and not threaded, the latest message is first.
      * If Sort is threaded, the latest message is first iff exactly one
@@ -199,7 +198,7 @@ static int ci_first_message (void)
          ((Sort ^ SortAux) & SORT_REVERSE)))
       return 0;
     else
-      return (Context->vcount ? Context->vcount - 1 : 0);
+      return Context->vcount ? Context->vcount - 1 : 0;
   }
   return 0;
 }
@@ -1976,7 +1975,7 @@ int mutt_index_menu (void)
   }
 
   mutt_menuDestroy (&menu);
-  return (closed);
+  return closed;
 }
 
 void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)