X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=47c4b3f392af80f95b3ce4e223785950c6cb6764;hp=fd927536c9b4a8729de835c379ced69ecfb73864;hb=1eeaaac6bdcad962c41bf975a32078cc4a0e578c;hpb=3755188848d66fd8c0638ce8514fbf57aa94518f diff --git a/browser.c b/browser.c index fd92753..47c4b3f 100644 --- a/browser.c +++ b/browser.c @@ -301,9 +301,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op, } if (optional) - mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0); + m_strformat (dest, destlen, ifstring, folder_format_str, data, 0); else if (flags & M_FORMAT_OPTIONAL) - mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0); + m_strformat (dest, destlen, elsestring, folder_format_str, data, 0); return (src); } @@ -350,10 +350,10 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op, case 's': if (flags & M_FORMAT_OPTIONAL) { if (folder->ff->nd->unread != 0) - mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str, + m_strformat (dest, destlen, ifstring, newsgroup_format_str, data, flags); else - mutt_FormatString (dest, destlen, elsestring, newsgroup_format_str, + m_strformat (dest, destlen, elsestring, newsgroup_format_str, data, flags); } else if (Context && Context->data == folder->ff->nd) { @@ -645,11 +645,11 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num) #ifdef USE_NNTP if (option (OPTNEWS)) - mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str, + m_strformat (s, slen, NONULL (GroupFormat), newsgroup_format_str, (unsigned long) &folder, M_FORMAT_ARROWCURSOR); else #endif - mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str, + m_strformat (s, slen, NONULL (FolderFormat), folder_format_str, (unsigned long) &folder, M_FORMAT_ARROWCURSOR); }