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 */
{
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
-#if USE_IMAP
int l = m_strlen(ImapHomeNamespace);
-#endif
int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
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) */
lencnt = m_strlen(no);
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]!='/') {