From 5e6273c09929249ee7a850934bf12fd03439d923 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 1 Nov 2006 00:48:23 +0100
Subject: [PATCH 1/1] I don't care about the release date. remove one more
 uglyness

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 Makefile.am |  5 +----
 commands.c  |  2 --
 curs_main.c |  1 -
 dotlock.c   |  6 +-----
 globals.h   | 10 ----------
 main.c      |  5 ++++-
 muttlib.c   |  7 +++----
 reldate.h   |  1 -
 8 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 reldate.h

diff --git a/Makefile.am b/Makefile.am
index 9315b21..a3d64f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	globals.h history.h init.h keymap.h mutt_crypt.h \
 	mapping.h mime.h mutt.h mutt_curses.h mutt_menu.h \
 	mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
-	mbox.h mh.h mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \
+	mbox.h mh.h mx.h pager.h pgp.h protos.h rfc1524.h rfc2047.h \
 	rfc2231.h rfc822.h rfc3676.h \
 	sort.h mime.types autogen.sh \
 	_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
@@ -140,9 +140,6 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 version.h: Makefile.am
 	echo "#define MUTT_REVISION \"git\"" > version.h
 
-reldate:
-	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
-
 install-exec-hook:
 	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then	\
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
diff --git a/commands.c b/commands.c
index 3a53ac7..edc09da 100644
--- a/commands.c
+++ b/commands.c
@@ -53,8 +53,6 @@
 #include <sys/types.h>
 #include <utime.h>
 
-extern char *ReleaseDate;
-
 /* The folder the user last saved to.  Used by ci_save_message() */
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
diff --git a/curs_main.c b/curs_main.c
index 18822d4..a7e8286 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -113,7 +113,6 @@ static const char *No_visible = N_("No visible messages.");
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-extern const char *ReleaseDate;
 extern size_t UngetCount;
 
 void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
diff --git a/dotlock.c b/dotlock.c
index 6870553..8fdc117 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -44,10 +44,6 @@
 #include <getopt.h>
 #endif
 
-#ifdef DL_STANDALONE
-# include "reldate.h"
-#endif
-
 #define MAXLINKS 1024           /* maximum link depth */
 
 #ifdef DL_STANDALONE
@@ -338,7 +334,7 @@ static void END_PRIVILEGED (void)
 
 static void usage (const char *av0)
 {
-  fprintf (stderr, "dotlock [Mutt-ng %s (%s)]\n", VERSION, ReleaseDate);
+  fprintf (stderr, "dotlock [Mutt-ng %s]\n", VERSION);
   fprintf (stderr, "usage: %s [-t|-f|-u|-d] [-p] [-r <retries>] file\n", av0);
 
   fputs ("\noptions:"
diff --git a/globals.h b/globals.h
index 62f829b..5977ee1 100644
--- a/globals.h
+++ b/globals.h
@@ -316,14 +316,4 @@ 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 */
diff --git a/main.c b/main.c
index 0a199b1..54899d8 100644
--- a/main.c
+++ b/main.c
@@ -25,10 +25,13 @@
 #include <lib-lib/file.h>
 
 #include "mutt.h"
+#include "mx.h"
+#include "buffy.h"
+#include "sort.h"
+#include "mutt_crypt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
-#include "mutt_crypt.h"
 #include "mutt_idna.h"
 #include "xterm.h"
 
diff --git a/muttlib.c b/muttlib.c
index 6146d4e..04c0b3a 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -27,7 +27,6 @@
 #include "url.h"
 #include "attach.h"
 
-#include "reldate.h"
 #include "version.h"
 
 #ifdef USE_IMAP
@@ -1296,9 +1295,9 @@ const char *mutt_make_version (int full)
   static char vstring[STRING];
 
   if (full)
-    snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based "
-              "on Mutt 1.5.11/%s)", MUTT_VERSION, MUTT_REVISION,
-              ReleaseDate);
+    snprintf (vstring, sizeof (vstring),
+              "Mutt-ng %s-r%s (based on Mutt 1.5.11)",
+              MUTT_VERSION, MUTT_REVISION);
   else
     snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
               MUTT_VERSION, MUTT_REVISION);
diff --git a/reldate.h b/reldate.h
deleted file mode 100644
index 88cba98..0000000
--- a/reldate.h
+++ /dev/null
@@ -1 +0,0 @@
-const char *ReleaseDate = "2005-09-15";
-- 
2.20.1