Nico Golde:

[apps/madmutt.git] / sidebar.c

diff --git a/sidebar.c b/sidebar.c
index 77c5510..c352913 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -60,9 +60,6 @@ void calc_boundaries (int menu)
     TopBuffy = 0;
 }
 
-/* compresses hierarchy in folder names;
- * FIXME move out to library?
- */
 static char *shortened_hierarchy (char *box)
 {
   int dots = 0;
@@ -120,7 +117,7 @@ char *make_sidebar_entry (char *box, int size, int new, int flagged)
 #if USE_IMAP
   if (ImapHomeNamespace && mutt_strlen (ImapHomeNamespace) > 0) {
     if (strncmp (box, ImapHomeNamespace, mutt_strlen (ImapHomeNamespace)) == 0
-        && strcmp (box, ImapHomeNamespace) != 0) {
+        && mutt_strcmp (box, ImapHomeNamespace) != 0) {
       box += mutt_strlen (ImapHomeNamespace) + 1;
     }
   }
@@ -314,7 +311,7 @@ int sidebar_draw (int menu)
       }
     }
     else {
-      if (Context && !strcmp (tmp->path, Context->path)) {
+      if (Context && !mutt_strcmp (tmp->path, Context->path)) {
         printw ("%.*s", SidebarWidth - delim_len,
                 make_sidebar_entry (basename (tmp->path),
                                     Context->msgcount, Context->unread,
@@ -348,7 +345,7 @@ static int exist_next_new () {
   int i = 0;
   if (list_empty(Incoming))
     return (-1);
-  i = CurBuffy;
+  i = CurBuffy + 1;
   while (i < Incoming->length)
     if (((BUFFY*) Incoming->data[i++])->msg_unread)
       return (i-1);
@@ -360,7 +357,7 @@ static int exist_prev_new () {
   int i = 0;
   if (list_empty(Incoming))
     return (-1);
-  i = CurBuffy;
+  i = CurBuffy - 1;
   while (i >= 0)
     if (((BUFFY*) Incoming->data[i--])->msg_unread)
       return (i+1);