rationnalize includes a lot:

[apps/madmutt.git] / imap / message.h

diff --git a/imap/message.h b/imap/message.h
index 78c5dc3..5657deb 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -1,21 +1,12 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>
- * 
- *     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.
+ */
 
 /* message.c data structures */
 
@@ -24,24 +15,22 @@
 
 /* -- data structures -- */
 /* IMAP-specific header data, stored as HEADER->data */
-typedef struct imap_header_data
-{
-  unsigned int uid;    /* 32-bit Message UID */
-  LIST *keywords;
+typedef struct imap_header_data {
+  int uid;                  /* 32-bit Message UID */
+  string_list_t *keywords;
 } IMAP_HEADER_DATA;
 
-typedef struct
-{
-  unsigned int read : 1;
-  unsigned int old : 1;
-  unsigned int deleted : 1;
-  unsigned int flagged : 1;
-  unsigned int replied : 1;
-  unsigned int changed : 1;
+typedef struct {
+  unsigned int read:1;
+  unsigned int old:1;
+  unsigned int deleted:1;
+  unsigned int flagged:1;
+  unsigned int replied:1;
+  unsigned int changed:1;
 
-  unsigned int sid;
+  int sid;
 
-  IMAP_HEADER_DATA* data;
+  IMAP_HEADER_DATA *data;
 
   time_t received;
   long content_length;