From 4ad84e4e5ca691c5f75e1bbd4cc7d0f4028d7365 Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 8 Jun 2006 11:56:05 +0000
Subject: [PATCH] Clean up ReleaseDate mess; include ReleaseDate in User-Agent
 header.

---
 commands.c  | 1 -
 curs_main.c | 1 -
 globals.h   | 5 +++++
 muttlib.c   | 2 --
 sendlib.c   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/commands.c b/commands.c
index 6dc8f291..8ec7c107 100644
--- a/commands.c
+++ b/commands.c
@@ -53,7 +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 a2012064..00a00a45 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -114,7 +114,6 @@ static const char *No_visible = N_("No visible messages.");
 #define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
 
-extern const char *ReleaseDate;
 extern size_t UngetCount;
 
 void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num)
diff --git a/globals.h b/globals.h
index cf1bafde..d7fbc383 100644
--- a/globals.h
+++ b/globals.h
@@ -139,6 +139,9 @@ WHERE char *Visual;
 WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
+
+WHERE const char *ReleaseDate;
+
 WHERE HASH *Groups;
 
 WHERE LIST *AutoViewList INITVAL(0);
@@ -161,6 +164,7 @@ WHERE RX_LIST *UnSubscribedLists INITVAL(0);
 WHERE SPAM_LIST *SpamList INITVAL(0);
 WHERE RX_LIST *NoSpamList INITVAL(0);
 
+
 /* bit vector for boolean variables */
 #ifdef MAIN_C
 unsigned char Options[(OPTMAX + 7)/8];
@@ -271,4 +275,5 @@ extern const char *Months[];
 #include "buffy.h"
 #include "sort.h"
 #include "mutt_crypt.h"
+#include "reldate.h"
 #endif /* MAIN_C */
diff --git a/muttlib.c b/muttlib.c
index 64f9ef7a..7bd9c6ed 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -28,8 +28,6 @@
 #include "mx.h"
 #include "url.h"
 
-#include "reldate.h"
-
 #ifdef USE_IMAP
 #include "imap.h"
 #endif
diff --git a/sendlib.c b/sendlib.c
index 124af627..75e3cb18 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -1649,7 +1649,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent)
   {
     /* Add a vanity header */
-    fprintf (fp, "User-Agent: Mutt/%s\n", MUTT_VERSION);
+    fprintf (fp, "User-Agent: Mutt/%s-%s\n", MUTT_VERSION, ReleaseDate);
   }
 
   return (ferror (fp) == 0 ? 0 : -1);
-- 
2.40.0