Clean up ReleaseDate mess; include ReleaseDate in User-Agent

header.

diff --git a/commands.c b/commands.c
index 6dc8f2915de8d6a93869dae99b8f45256fbc8222..8ec7c107e0bde3a1fc448d0bf22a3e7082333c09 100644 (file)
--- 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 a20120641492bd7d5bde5eea2b9256c1d3925d5e..00a00a456ca30954387bcdf46c75962b344c6339 100644 (file)
--- 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 cf1bafdeafdf0940c17503e59ec63ea3d5c74aea..d7fbc383e615996d18557cdce35deb82b7ccaa1f 100644 (file)
--- 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 64f9ef7a2c1327c57e82a12e7699b715f5f05565..7bd9c6edbfb0d27ce724f8cf2416bd650a0f8ce5 100644 (file)
--- 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 124af6279a8081f3317b2576f4f821faec374467..75e3cb187012b27647826d21bc92daf25c303474 100644 (file)
--- 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);