X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=5ce19220145b788ee29b7aff2c64dd5023e59475;hp=cd3db75a294e43045142932d9a9039698e5a63fc;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=c6b9d35ed9361e4defab9762a7480d5126405ae9

diff --git a/sidebar.c b/sidebar.c
index cd3db75..5ce1922 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -102,7 +102,7 @@ static const char* sidebar_number_format (char* dest, size_t destlen, char op,
   char tmp[SHORT_STRING];
   BUFFY* b = (BUFFY*) Incoming->data[data];
   int opt = flags & M_FORMAT_OPTIONAL;
-  int c = Context && str_eq (Context->path, b->path);
+  int c = Context && !m_strcmp(Context->path, b->path);
 
   switch (op) {
     /* deleted */
@@ -199,7 +199,7 @@ int make_sidebar_entry (char* box, int idx, size_t len)
     SidebarWidth = COLS;
 
   if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path && 
-      !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
+      m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
     /* if $sidebar_newmail_only is set, don't display the
      * box only if it's not the currently opened
      * (i.e. always display the currently opened) */
@@ -211,12 +211,12 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   memset(&entry, ' ', sizeof(entry));
 
 #if USE_IMAP
-  if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 
+  if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 && 
       m_strlen(box) > l)
     box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
 #endif
-  if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 
+  if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 && 
       m_strlen(box) > l_m) {
     box += l_m;
     if (Maildir[strlen(Maildir)-1]!='/') {
@@ -232,7 +232,7 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 
   m_strcpy(entry, len - lencnt, box);
   entry[m_strlen(entry)] = ' ';
-  m_strcpy(entry + (len - lencnt), lencnt, no);
+  memcpy(entry + (len - lencnt), no, lencnt);
 
   addnstr (entry, len);