From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Thu, 29 Jul 2010 20:40:15 +0000 (+0000)
Subject: correct some mistakes
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=2f1d3ba0ed5006b1fc8223ca6976808014095635;p=web%2Fkonrad%2Fsmoke.git

correct some mistakes
add namespace


git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@579 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/src/iface/msinterface.cpp b/src/iface/msinterface.cpp
index 1315fb9..8fdfdbd 100644
--- a/src/iface/msinterface.cpp
+++ b/src/iface/msinterface.cpp
@@ -94,7 +94,7 @@ bool MSInterface::checkServer()
 		return false;
 	}
 	//is server new enough for me?
-	if(si.getServerVersion().value()<commVersion()){
+	if(si.getServerProtocolVersion().value()<commVersion()){
 		QMessageBox::warning(0,tr("Error"),tr("The server implementation is too old for this client."));
 		return false;
 	}
diff --git a/wob/magicsmoke.wolf b/wob/magicsmoke.wolf
index abff883..e6570e7 100644
--- a/wob/magicsmoke.wolf
+++ b/wob/magicsmoke.wolf
@@ -10,7 +10,7 @@
 	<Doc>These files describe the database schema and communication protocol of MagicSmoke.</Doc>
 	<Doc>(c) Konrad Rosenbaum, 2009-2010&lt;br/>these files are protected under the GNU AGPLv3 or at your option any newer</Doc>
 	<!-- generic settings -->
-	<Project baseDir=".." wobDir="wob" name="MagicSmoke"/>
+	<Project baseDir=".." wobDir="wob" name="MagicSmoke" xml-namespace="http://silmor.de/MagicSmoke"/>
 	<Version comm="0100" needcomm="0100" humanReadable="1.91 alpha" svnTarget="."/>
 	<Include file="db/db.wolf"/>
 	
diff --git a/wob/transact/user.wolf b/wob/transact/user.wolf
index 3507064..5f6e32e 100644
--- a/wob/transact/user.wolf
+++ b/wob/transact/user.wolf
@@ -11,7 +11,7 @@
 		<Input/>
 		<Call lang="php" method="Version::serverInfoXml($this);"/>
 		<Output>
-			<Var name="ServerVersion" type="string"/>
+			<Var name="ServerVersion" type="astring"/>
 			<Var name="MinimumProtocolVersion" type="astring"/>
 			<Var name="ServerProtocolVersion" type="astring"/>
 		</Output>
diff --git a/www/inc/machine/version.php b/www/inc/machine/version.php
index 32443ed..af4a6db 100644
--- a/www/inc/machine/version.php
+++ b/www/inc/machine/version.php
@@ -3,9 +3,9 @@ class Version {
 public static function serverInfoXml($trans)
 {
 	global $MSVERSION;
-	$trans->setServerVersion($trans->commVersion());
+	$trans->setServerVersion($trans->version());
 	$trans->setMinimumProtocolVersion($trans->needCommVersion());
-	$trans->setServerProtocolVersion($trans->version());
+	$trans->setServerProtocolVersion($trans->commVersion());
 }
 };