fixes in the sidebar format, was completely braindead.

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index fd92753..4af5dca 100644 (file)
--- 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,12 +645,14 @@ 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,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
+                (unsigned long)&folder,
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
   else
 #endif
-    mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
+               (unsigned long)&folder,
+               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static void init_menu (struct browser_state *state, MUTTMENU * menu,