move record as well (yeah, I'm a selfish bitch, I migrate things in my own folder...

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index 921a8bf..0519dfb 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -36,7 +36,6 @@ WHERE char *EditorHeaders;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
-WHERE char *Fqdn;
 WHERE char *HdrFmt;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
@@ -47,7 +46,6 @@ WHERE char *ImapLogin INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
 WHERE char *Inbox;
-WHERE char *Ispell;
 WHERE char *Locale;
 WHERE char *Maildir;
 
@@ -76,9 +74,6 @@ WHERE short NetInc;
 
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-
-WHERE char *OperatingSystem INITVAL (NULL);
-
 WHERE char *Muttrc INITVAL (NULL);
 
 #ifdef USE_NNTP
@@ -90,7 +85,6 @@ WHERE char *NntpUser;
 WHERE char *NntpPass;
 WHERE char *NewsRc;
 #endif
-WHERE char *Outbox;
 WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
@@ -110,7 +104,6 @@ WHERE char *Realname;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
-WHERE char *Signature;
 WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
@@ -148,30 +141,16 @@ WHERE char *XtermIcon;
 WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
-WHERE string_list_t *AutoViewList INITVAL (0);
-WHERE string_list_t *AlternativeOrderList INITVAL (0);
 WHERE string_list_t *AttachAllow INITVAL(0);
 WHERE string_list_t *AttachExclude INITVAL(0);
 WHERE string_list_t *InlineAllow INITVAL(0);
 WHERE string_list_t *InlineExclude INITVAL(0);
-WHERE string_list_t *HeaderOrderList INITVAL (0);
-WHERE string_list_t *Ignore INITVAL (0);
-WHERE string_list_t *MimeLookupList INITVAL (0);
-WHERE string_list_t *UnIgnore INITVAL (0);
 
 /* bit vector for boolean variables */
-#ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7) / 8];
-#else
-extern unsigned char Options[];
-#endif
+WHERE unsigned char Options[(OPTMAX + 7) / 8];
 
 /* bit vector for the yes/no/ask variable type */
-#ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
-#else
-extern unsigned char QuadOptions[];
-#endif
+WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;