X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=4a927d92fda3c6778a3e8a2dce0d922b6f805098;hp=2cc33417944fb282ae7cfbf873f7dde332d9662b;hb=552847916ae6671d52db12880ee337f880cc766b;hpb=b23d5033080fe9f9fba038e3cf1e3ec2b0a0d33d

diff --git a/browser.c b/browser.c
index 2cc3341..4a927d9 100644
--- a/browser.c
+++ b/browser.c
@@ -65,9 +65,9 @@ static void destroy_state (struct browser_state *state)
   int c;
 
   for (c = 0; c < state->entrylen; c++) {
-    p_delete(&((state->entry)[c].name));
-    p_delete(&((state->entry)[c].desc));
-    p_delete(&((state->entry)[c].st));
+    p_delete(&state->entry[c].name);
+    p_delete(&state->entry[c].desc);
+    p_delete(&state->entry[c].st);
   }
   p_delete(&state->folder);
   p_delete(&state->entry);
@@ -184,9 +184,9 @@ folder_format_str(char *dest, ssize_t destlen, char op,
       const char *s;
 
       if (folder->ff->imap)
-        s = NONULL (folder->ff->desc);
+        s = NONULL(folder->ff->desc);
       else
-        s = NONULL (folder->ff->name);
+        s = NONULL(folder->ff->name);
 
       snprintf (fn, sizeof (fn), "%s%s", s,
                 folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
@@ -200,9 +200,8 @@ folder_format_str(char *dest, ssize_t destlen, char op,
   case 'F':
     if (folder->ff->st != NULL) {
       snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
-                S_ISDIR (folder->ff->st->
-                         st_mode) ? 'd' : (S_ISLNK (folder->ff->st->
-                                                    st_mode) ? 'l' : '-'),
+                S_ISDIR(folder->ff->st-> st_mode)
+                ? 'd' : (S_ISLNK(folder->ff->st-> st_mode) ? 'l' : '-'),
                 (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-',
                 (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
                 (folder->ff->st->st_mode & S_ISUID) !=
@@ -465,11 +464,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
         continue;
       if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
-#ifdef USE_NNTP
       add_folder (menu, state, data->group, NULL, data, data->new);
-#else
-      add_folder (menu, state, data->group, NULL, data->new);
-#endif
     }
     sidebar_draw ();
   }
@@ -931,7 +926,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
             /* try to restore the old values */
             m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
             if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-              m_strcpy(LastDir, sizeof(LastDir), NONULL(Homedir));
+              m_strcpy(LastDir, sizeof(LastDir), NONULL(MCore.homedir));
               goto bail;
             }
           }