Rocco Rutte:

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index c0df6d1..d5bd3b7 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -23,7 +23,7 @@
 #include "attach.h"
 
 #include "reldate.h"
-#include "svnrev.h"
+#include "version.h"
 
 #ifdef USE_IMAP
 #include "imap.h"
@@ -1285,12 +1285,17 @@ time_t mutt_decrease_mtime (const char *f, struct stat *st)
   return mtime;
 }
 
-const char *mutt_make_version (void)
+const char *mutt_make_version (int full)
 {
   static char vstring[STRING];
 
-  snprintf (vstring, sizeof (vstring), "Mutt-ng %s-%s (based on Mutt 1.5.10/%s)",
-            MUTT_VERSION, MUTTNG_SVNREV, ReleaseDate);
+  if (full)
+    snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based "
+              "on Mutt 1.5.10/%s)", MUTT_VERSION, MUTT_REVISION,
+              ReleaseDate);
+  else
+    snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
+              MUTT_VERSION, MUTT_REVISION);
   return vstring;
 }