X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.h;h=91764b612a60c757296b4daae4fb034c29bb0521;hp=cbfe9a35ece6117454e96584ea61ec9745918642;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/browser.h b/browser.h
index cbfe9a3..91764b6 100644
--- a/browser.h
+++ b/browser.h
@@ -1,27 +1,17 @@
-/* $Id: browser.h,v 3.1 2002/12/11 11:19:39 roessler Exp $ */
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #ifndef _BROWSER_H
 #define _BROWSER_H 1
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include "nntp/nntp.h"
 #endif
 
 struct folder_file {
@@ -34,13 +24,11 @@ struct folder_file {
   char *desc;
 
   unsigned short new;
-#ifdef USE_IMAP
   char delim;
 
   unsigned imap:1;
   unsigned selectable:1;
   unsigned inferiors:1;
-#endif
 #ifdef USE_NNTP
   NNTP_DATA *nd;
 #endif
@@ -49,15 +37,13 @@ struct folder_file {
 
 struct browser_state {
   struct folder_file *entry;
-  unsigned int entrylen;        /* number of real entries */
-  unsigned int entrymax;        /* max entry */
-#ifdef USE_IMAP
+  int entrylen;        /* number of real entries */
+  int entrymax;        /* max entry */
   short imap_browse;
   char *folder;
   unsigned noselect:1;
   unsigned marked:1;
   unsigned unmarked:1;
-#endif
 };
 
 #endif /* _BROWSER_H */