let m_strformat accept NULL formats.

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

diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index e55537f..7ae1c32 100644 (file)
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -95,9 +95,9 @@ static char *shortened_hierarchy (char *hbox, int maxlen)
 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,
-                                          unsigned long data, format_flag flags) {
+                                          anytype data, format_flag flags) {
   char tmp[STRING];
-  BUFFY* b = Incoming.arr[data];
+  BUFFY* b = Incoming.arr[data.i];
   int opt = flags & M_FORMAT_OPTIONAL;
   int c = Context && !m_strcmp(Context->path, b->path);
 
@@ -197,8 +197,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, NONULL(SidebarNumberFormat), sidebar_number_format,
-              idx, 0);
+  m_strformat(no, len, SidebarNumberFormat, sidebar_number_format, idx, 0);
   lencnt = m_strlen(no);
 
   if (l > 0 && m_strncmp(sbox, ImapHomeNamespace, l) == 0 &&