From 2aea567fe25c74f746b9b63f8d71ae71d360fde1 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 29 Apr 2013 14:46:53 +0200
Subject: [PATCH] Changed: Moved Ryzom detailed version in client

---
 code/nel/src/gui/libwww.cpp                   | 33 ------------------
 .../src/interface_v3/interface_manager.cpp    | 34 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/code/nel/src/gui/libwww.cpp b/code/nel/src/gui/libwww.cpp
index 6e9069f96..1926d6514 100644
--- a/code/nel/src/gui/libwww.cpp
+++ b/code/nel/src/gui/libwww.cpp
@@ -29,10 +29,6 @@ extern "C"
 #include "nel/gui/group_html.h"
 #include "nel/gui/libwww_nel_stream.h"
 
-#ifdef HAVE_REVISION_H
-#include "revision.h"
-#endif
-
 using namespace NLMISC;
 
 // The HText structure for libwww
@@ -554,35 +550,6 @@ namespace NLGUI
 			HTTrace_setCallback(NelTracer);
 
 			/* Initiate libwww */
-
-#if defined(HAVE_X86_64)
-#define RYZOM_ARCH "x64"
-#elif defined(HAVE_X86)
-#define RYZOM_ARCH "x86"
-#elif defined(HAVE_ARM)
-#define RYZOM_ARCH "arm"
-#else
-#define RYZOM_ARCH "unknow"
-#endif
-#if defined(NL_OS_WINDOWS)
-#define RYZOM_SYSTEM "windows"
-#elif defined(NL_OS_MAC)
-#define RYZOM_SYSTEM "mac"
-#elif defined(NL_OS_UNIX)
-#define RYZOM_SYSTEM "unix"
-#else
-#define RYZOM_SYSTEM "unkown"
-#endif
-
-/*
-			char buffer[256];
-#ifdef REVISION
-			sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
-#else
-			sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
-#endif
-*/
-			
 			HTLib_setAppName( CGroupHTML::options.appName.c_str() );
 			HTLib_setAppVersion( CGroupHTML::options.appVersion.c_str() );
 
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 65eda61e8..d352aff91 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -132,6 +132,29 @@ using namespace NLGUI;
 
 #include "../global.h"
 
+#ifdef HAVE_REVISION_H
+#include "revision.h"
+#endif
+
+#if defined(HAVE_X86_64)
+#define RYZOM_ARCH "x64"
+#elif defined(HAVE_X86)
+#define RYZOM_ARCH "x86"
+#elif defined(HAVE_ARM)
+#define RYZOM_ARCH "arm"
+#else
+#define RYZOM_ARCH "unknow"
+#endif
+#if defined(NL_OS_WINDOWS)
+#define RYZOM_SYSTEM "windows"
+#elif defined(NL_OS_MAC)
+#define RYZOM_SYSTEM "mac"
+#elif defined(NL_OS_UNIX)
+#define RYZOM_SYSTEM "unix"
+#else
+#define RYZOM_SYSTEM "unkown"
+#endif
+
 using namespace NLMISC;
 
 namespace NLGUI
@@ -465,10 +488,19 @@ CInterfaceManager::CInterfaceManager()
 	CViewRenderer::getInstance();
 	CViewTextID::setTextProvider( &SMTextProvider );
 	CViewTextFormated::setFormatter( &RyzomTextFormatter );
+
+	char buffer[256];
+
+#ifdef REVISION
+	sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
+#else
+	sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
+#endif
+
 	CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
 	CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
 	CGroupHTML::options.appName = "Ryzom";
-	CGroupHTML::options.appVersion = RYZOM_VERSION;
+	CGroupHTML::options.appVersion = buffer;
 
 	NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
 	interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();