X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fsidebar.c;h=8065e5576b1700e255a05cc99f60de851bc7f7e0;hp=e55537f76b730d0760b68f84f549e960879422fe;hb=f5a370338d87eba00bc8696636a90f6c50b05d14;hpb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d

diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index e55537f..8065e55 100644
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -92,12 +92,14 @@ 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,
-                                          unsigned long 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];
+  BUFFY* b = Incoming.arr[data.i];
   int opt = flags & M_FORMAT_OPTIONAL;
   int c = Context && !m_strcmp(Context->path, b->path);
 
@@ -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;
 }
 
@@ -184,7 +186,6 @@ static int make_sidebar_entry (char* sbox, int idx, ssize_t len)
 {
   int shortened = 0, lencnt = 0;
   char no[STRING], entry[STRING];
-  int l = m_strlen(ImapHomeNamespace);
   int l_m = m_strlen(Maildir);
 
   if (SidebarWidth > COLS)
@@ -197,14 +198,9 @@ 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, SidebarWidth, SidebarNumberFormat, sidebar_number_format, idx, 0);
   lencnt = m_strlen(no);
 
-  if (l > 0 && m_strncmp(sbox, ImapHomeNamespace, l) == 0 && 
-      m_strlen(sbox) > l)
-    sbox += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
-  else
   if (l_m > 0 && m_strncmp(sbox, Maildir, l_m) == 0 && 
       m_strlen(sbox) > l_m) {
     sbox += l_m;