using stls should not enable new CAPAs

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

diff --git a/lib-ui/browser.c b/lib-ui/browser.c
index 466cf77..5ef937a 100644 (file)
--- a/lib-ui/browser.c
+++ b/lib-ui/browser.c
@@ -53,7 +53,7 @@ static int browser_compare_subject (const void *a, const void *b)
 
   int r = strcoll(NONULL(pa->name), NONULL(pb->name));
 
-  return ((BrowserSort & SORT_REVERSE) ? -r : r);
+  return (BrowserSort & SORT_REVERSE) ? -r : r;
 }
 
 static int browser_compare_date (const void *a, const void *b)
@@ -63,7 +63,7 @@ static int browser_compare_date (const void *a, const void *b)
 
   int r = pa->mtime - pb->mtime;
 
-  return ((BrowserSort & SORT_REVERSE) ? -r : r);
+  return (BrowserSort & SORT_REVERSE) ? -r : r;
 }
 
 static int browser_compare_size (const void *a, const void *b)
@@ -73,7 +73,7 @@ static int browser_compare_size (const void *a, const void *b)
 
   int r = pa->size - pb->size;
 
-  return ((BrowserSort & SORT_REVERSE) ? -r : r);
+  return (BrowserSort & SORT_REVERSE) ? -r : r;
 }
 
 static void browser_sort (struct browser_state *state)
@@ -105,7 +105,7 @@ static int link_is_dir (const char *folder, const char *path)
   mutt_concat_path(fullpath, sizeof(fullpath), folder, path);
 
   if (stat (fullpath, &st) == 0)
-    return (S_ISDIR (st.st_mode));
+    return S_ISDIR (st.st_mode);
   else
     return 0;
 }
@@ -218,7 +218,7 @@ folder_format_str(char *dest, ssize_t destlen, char op,
     break;
 
   case 'N':
-    if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) {
+    if (imap_mx.mx_is_magic (folder->ff->desc, NULL) == M_IMAP) {
       if (!optional) {
         snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
         snprintf (dest, destlen, tmp, folder->ff->new);
@@ -330,19 +330,19 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       }
     }
     mutt_perror (d);
-    return (-1);
+    return -1;
   }
 
   if (!S_ISDIR (s.st_mode)) {
     mutt_error (_("%s is not a directory."), d);
-    return (-1);
+    return -1;
   }
 
   buffy_check (0);
 
   if ((dp = opendir (d)) == NULL) {
     mutt_perror (d);
-    return (-1);
+    return -1;
   }
 
   init_state (state, menu);
@@ -382,7 +382,7 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
   BUFFY* tmp;
 
   if (!Incoming.len)
-    return (-1);
+    return -1;
   buffy_check (0);
 
   init_state (state, menu);
@@ -503,7 +503,7 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
 
   if (*f) {
     mutt_expand_path (f, flen);
-    if (imap_is_magic (f, NULL) == M_IMAP) {
+    if (imap_mx.mx_is_magic (f, NULL) == M_IMAP) {
       init_state (&state, NULL);
       state.imap_browse = 1;
       if (!imap_browse (f, &state))
@@ -542,7 +542,7 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
     else if (!LastDir[0])
       m_strcpy(LastDir, sizeof(LastDir), NONULL(Maildir));
 
-    if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
+    if (!buffy && imap_mx.mx_is_magic (LastDir, NULL) == M_IMAP) {
       init_state (&state, NULL);
       state.imap_browse = 1;
       imap_browse (LastDir, &state);
@@ -833,7 +833,7 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
           buf[0]) {
         buffy = 0;
         mutt_expand_path (buf, sizeof (buf));
-        if (imap_is_magic (buf, NULL) == M_IMAP) {
+        if (imap_mx.mx_is_magic (buf, NULL) == M_IMAP) {
           m_strcpy(LastDir, sizeof(LastDir), buf);
           destroy_state (&state);
           init_state (&state, NULL);
@@ -987,7 +987,7 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         if (examine_mailboxes (menu, &state) == -1)
           goto bail;
       }
-      else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
+      else if (imap_mx.mx_is_magic (LastDir, NULL) == M_IMAP) {
         init_state (&state, NULL);
         state.imap_browse = 1;
         imap_browse (LastDir, &state);