summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-05-30 20:17:42 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-05-30 20:17:42 (GMT)
commit0ee5bb4d983e59b0d1d983077613804a12c62109 (patch)
tree07a885cb890d1b5002eca6c5aca2769cefc9d946 /Swift/Controllers
parentb58d7bf2cbc310b097760e6266659f70d2fd5a0a (diff)
downloadswift-0ee5bb4d983e59b0d1d983077613804a12c62109.zip
swift-0ee5bb4d983e59b0d1d983077613804a12c62109.tar.bz2
Use the same version number in iq:version and about window.
Resolves: #428
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/MainController.cpp3
-rw-r--r--Swift/Controllers/SConscript3
2 files changed, 5 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index d8781c8..573bff9 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -15,6 +15,7 @@
#include "Swiften/Application/ApplicationMessageDisplay.h"
#include "Swiften/Network/TimerFactory.h"
#include "Swiften/Network/BoostTimerFactory.h"
+#include "Swift/Controllers/BuildVersion.h"
#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/Chat/MUCSearchController.h"
#include "Swift/Controllers/Chat/ChatsManager.h"
@@ -195,7 +196,7 @@ void MainController::handleConnected() {
eventWindowController_ = new EventWindowController(eventController_, eventWindowFactory_);
- clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, CLIENT_VERSION, client_);
+ clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, buildVersion, client_);
loginWindow_->morphInto(rosterController_->getWindow());
DiscoInfo discoInfo;
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index eb63bed..ad03a5a 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -1,4 +1,5 @@
Import("env")
+import Version
################################################################################
# Flags
@@ -10,12 +11,14 @@ if env["SCONS_STAGE"] == "flags" :
"LIBS": ["SwiftControllers"]
}
+
################################################################################
# Build
################################################################################
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
+ myenv.BuildVersion("BuildVersion.h", project = "swift")
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.StaticLibrary("SwiftControllers", [
"Chat/ChatController.cpp",