From 3bc61625ba94ff532ef02de7872a4cf49be49d59 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Sun, 3 Nov 2013 09:09:08 +0000
Subject: Split experimental File Transfer out from History and Whiteboarding.

Effectively disables whiteboarding and history in default builds so we can avoid having to do a full cleanup of them for 3.0. File transfer remains enabled in default builds as we're intending getting that ready and shipping it.

Change-Id: I8c1dcc989f238b58d6d7c426485e7cf582514d8f

diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 4e7e037..3a0551c 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -72,7 +72,8 @@ vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccep
 vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept))
 vars.Add(BoolVariable("build_examples", "Build example programs", "yes"))
 vars.Add(BoolVariable("enable_variants", "Build in a separate dir under build/, depending on compile flags", "no"))
-vars.Add(BoolVariable("experimental", "Build experimental features", "yes"))
+vars.Add(BoolVariable("experimental_ft", "Build experimental file transfer", "yes"))
+vars.Add(BoolVariable("experimental", "Build experimental features", "no"))
 vars.Add(BoolVariable("set_iterator_debug_level", "Set _ITERATOR_DEBUG_LEVEL=0", "yes"))
 vars.Add(BoolVariable("unbound", "Build bundled ldns and unbound. Use them for DNS lookup.", "no"))
 
@@ -241,8 +242,11 @@ if env.get("mac106", 0) :
 if not env["assertions"] :
 	env.Append(CPPDEFINES = ["NDEBUG"])
 
+if env["experimental_ft"] :
+	env.Append(CPPDEFINES = ["SWIFT_EXPERIMENTAL_FT"])
+
 if env["experimental"] :
-	env.Append(CPPDEFINES = ["SWIFT_EXPERIMENTAL_FT", "SWIFT_EXPERIMENTAL_HISTORY", "SWIFT_EXPERIMENTAL_WB"])
+	env.Append(CPPDEFINES = ["SWIFT_EXPERIMENTAL_HISTORY", "SWIFT_EXPERIMENTAL_WB"])
 
 # If we build shared libs on AMD64, we need -fPIC.
 # This should have no performance impact om AMD64
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index ce78d03..9eeaabe 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -351,7 +351,7 @@ else :
     env["UNBOUND_FLAGS"] = {}
 
 # LibMiniUPnPc
-if env["experimental"] :
+if env["experimental_ft"] :
 	libminiupnpc_flags = {"CPPPATH": ["/usr/include/miniupnpc/"]}
 	libminiupnpc_conf_env = conf_env.Clone()
 	if env.get("libminiupnpc_libdir", None) :
@@ -372,7 +372,7 @@ else :
 	env["LIBMINIUPNPC_FLAGS"] = {}
 
 # LibNATPMP
-if env["experimental"] :
+if env["experimental_ft"] :
 	libnatpmp_flags = {}
 	libnatpmp_conf_env = conf_env.Clone()
 	if env.get("libnatpmp_libdir", None) :
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 14f0727..a201994 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -364,7 +364,7 @@ void MainController::handleConnected() {
 		historyViewController_ = new HistoryViewController(jid_, uiEventStream_, historyController_, client_->getNickResolver(), client_->getAvatarManager(), client_->getPresenceOracle(), uiFactory_);
 		chatsManager_ = new ChatsManager(jid_, client_->getStanzaChannel(), client_->getIQRouter(), eventController_, uiFactory_, uiFactory_, client_->getNickResolver(), client_->getPresenceOracle(), client_->getPresenceSender(), uiEventStream_, uiFactory_, useDelayForLatency_, networkFactories_->getTimerFactory(), client_->getMUCRegistry(), client_->getEntityCapsProvider(), client_->getMUCManager(), uiFactory_, profileSettings_, ftOverview_, client_->getRoster(), !settings_->getSetting(SettingConstants::REMEMBER_RECENT_CHATS), settings_, historyController_, whiteboardManager_, highlightManager_, client_->getClientBlockListManager(), emoticons_, userSearchControllerInvite_);
 #else
-		chatsManager_ = new ChatsManager(jid_, client_->getStanzaChannel(), client_->getIQRouter(), eventController_, uiFactory_, uiFactory_, client_->getNickResolver(), client_->getPresenceOracle(), client_->getPresenceSender(), uiEventStream_, uiFactory_, useDelayForLatency_, networkFactories_->getTimerFactory(), client_->getMUCRegistry(), client_->getEntityCapsProvider(), client_->getMUCManager(), uiFactory_, profileSettings_, ftOverview_, client_->getRoster(), !settings_->getSetting(SettingConstants::REMEMBER_RECENT_CHATS), settings_, NULL, whiteboardManager_, highlightManager_, client_->getClientBlockListManager(), &emoticons_, userSearchControllerInvite_);
+		chatsManager_ = new ChatsManager(jid_, client_->getStanzaChannel(), client_->getIQRouter(), eventController_, uiFactory_, uiFactory_, client_->getNickResolver(), client_->getPresenceOracle(), client_->getPresenceSender(), uiEventStream_, uiFactory_, useDelayForLatency_, networkFactories_->getTimerFactory(), client_->getMUCRegistry(), client_->getEntityCapsProvider(), client_->getMUCManager(), uiFactory_, profileSettings_, ftOverview_, client_->getRoster(), !settings_->getSetting(SettingConstants::REMEMBER_RECENT_CHATS), settings_, NULL, whiteboardManager_, highlightManager_, client_->getClientBlockListManager(), emoticons_, userSearchControllerInvite_);
 #endif
 		contactsFromRosterProvider_ = new ContactsFromXMPPRoster(client_->getRoster(), client_->getAvatarManager(), client_->getPresenceOracle());
 		contactSuggesterWithoutRoster_->addContactProvider(chatsManager_);
diff --git a/Swiften/Network/SConscript b/Swiften/Network/SConscript
index ea0fb62..fcc66b4 100644
--- a/Swiften/Network/SConscript
+++ b/Swiften/Network/SConscript
@@ -81,7 +81,7 @@ else :
 
 objects = myenv.SwiftenObject(sourceList)
 
-if myenv["experimental"] :	
+if myenv["experimental_ft"] :	
 	# LibNATPMP classes
 	if myenv.get("HAVE_LIBNATPMP", False) :
 		natpmp_env = myenv.Clone()	
-- 
cgit v0.10.2-6-g49f6