Display "Mana" as part of the version in Setup window

This was already done in the log, when responding to the --version
parameter and for the label on the Desktop widget, but not in the Setup
window. Now it is consistently part of the FULL_VERSION define.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 05e3af01..e98006a8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -232,7 +232,7 @@ Client::Client(const Options &options):
     logger->setLogToStandardOut(config.getBoolValue("logToStandardOut"));
 
     // Log the mana version
-    logger->log("Mana %s", FULL_VERSION);
+    logger->log("%s", FULL_VERSION);
 
     initScreenshotDir();
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index ca86360e..c8ded9f5 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -45,7 +45,7 @@ Desktop::Desktop()
     if (appName.empty())
         mVersionLabel = new Label(FULL_VERSION);
     else
-        mVersionLabel = new Label(strprintf("%s (Mana %s)", appName.c_str(),
+        mVersionLabel = new Label(strprintf("%s (%s)", appName.c_str(),
                                             FULL_VERSION));
 
     mVersionLabel->setBackgroundColor(gcn::Color(255, 255, 255, 128));
diff --git a/src/main.cpp b/src/main.cpp
index 935f2d89..b27152e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -77,7 +77,7 @@ static void printHelp()
 
 static void printVersion()
 {
-    std::cout << strprintf("Mana client %s", FULL_VERSION) << std::endl;
+    std::cout << strprintf("%s", FULL_VERSION) << std::endl;
 }
 
 static void parseOptions(int argc, char *argv[], Client::Options &options)
diff --git a/src/main.h b/src/main.h
index b0917e2a..c1cf3e3f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -51,9 +51,9 @@
  */
 
 #ifdef PACKAGE_VERSION
-#define FULL_VERSION "v" PACKAGE_VERSION
+#define FULL_VERSION "Mana " PACKAGE_VERSION
 #else
-#define FULL_VERSION "Unknown Version"
+#define FULL_VERSION "Mana (unknown version)"
 #endif
 
 #ifdef PACKAGE_OS