rework m_strformat so that it takes the cols number to use in case of

[apps/madmutt.git] / lib-ui / sidebar.c

diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index 7ae1c32..9f6e9ce 100644 (file)
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -92,10 +92,12 @@ static char *shortened_hierarchy (char *hbox, int maxlen)
   return m_strdup(hbox);
 }
 
-static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
-                                          const char* src, const char* fmt,
-                                          const char* ifstr, const char* elstr,
-                                          anytype data, format_flag flags) {
+static const char *
+sidebar_number_format(char* dest, ssize_t destlen,
+                      char op, const char* src, const char* fmt,
+                      const char* ifstr, const char* elstr,
+                      anytype data, format_flag flags)
+{
   char tmp[STRING];
   BUFFY* b = Incoming.arr[data.i];
   int opt = flags & M_FORMAT_OPTIONAL;
@@ -163,8 +165,8 @@ static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
   }
 
   if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, opt ? ifstr : elstr, sidebar_number_format,
-                data, flags);
+    m_strformat(dest, destlen, 0, opt ? ifstr : elstr,
+                sidebar_number_format, data, flags);
   return src;
 }
 
@@ -197,7 +199,7 @@ static int make_sidebar_entry (char* sbox, int idx, ssize_t len)
      * (i.e. always display the currently opened) */
     return 0;
 
-  m_strformat(no, len, SidebarNumberFormat, sidebar_number_format, idx, 0);
+  m_strformat(no, len, SidebarWidth, SidebarNumberFormat, sidebar_number_format, idx, 0);
   lencnt = m_strlen(no);
 
   if (l > 0 && m_strncmp(sbox, ImapHomeNamespace, l) == 0 &&