X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=7a624d9e7a57ba4e2a0cc4336764cbda66a7776f;hp=62f829be8726049c518b4d350b4506bdcaaa2ef9;hb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/globals.h b/globals.h
index 62f829b..7a624d9 100644
--- a/globals.h
+++ b/globals.h
@@ -29,8 +29,8 @@ WHERE char Quotebuf[SHORT_STRING];
 WHERE char *MuttDotlock;
 #endif
 
-WHERE ADDRESS *EnvFrom;
-WHERE ADDRESS *From;
+WHERE address_t *EnvFrom;
+WHERE address_t *From;
 
 WHERE char *AliasFile;
 WHERE char *AliasFmt;
@@ -304,26 +304,9 @@ const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
 const char *Months[] =
   { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 "Nov", "Dec", "ERR" };
-
-const char *BodyTypes[] =
-  { "x-unknown", "audio", "application", "image", "message", "model",
-"multipart", "text", "video" };
-const char *BodyEncodings[] =
-  { "x-unknown", "7bit", "8bit", "quoted-printable", "base64", "binary",
-"x-uuencoded" };
 #else
 extern const char *Weekdays[];
 extern const char *Months[];
 #endif
 
-#ifdef MAIN_C
-/* so that global vars get included
- * FIXME WTF IS THIS?!?!???!?!??!?!??
- */
-#include "mx.h"
-#include "buffy.h"
-#include "sort.h"
-#include "mutt_crypt.h"
-#endif /* MAIN_C */
-
 #endif /* !_GLOBALS_H */