11 files changed, 132 insertions, 132 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index 15a68c6..812c472 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -3,15 +3,15 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv = env.Clone()
+    myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
-	for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
-		if ARGUMENTS.get(i.lower(), False) :
-			myenv["ENV"][i] = ARGUMENTS[i.lower()]
-		elif os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+        if ARGUMENTS.get(i.lower(), False) :
+            myenv["ENV"][i] = ARGUMENTS[i.lower()]
+        elif os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
-	myenv.Test(tester, "system")
+    tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
+    myenv.Test(tester, "system")
diff --git a/Swiften/QA/ConcurrentFileTransferTest/SConscript b/Swiften/QA/ConcurrentFileTransferTest/SConscript
index 1b4cdbc..94b37fd 100644
--- a/Swiften/QA/ConcurrentFileTransferTest/SConscript
+++ b/Swiften/QA/ConcurrentFileTransferTest/SConscript
@@ -3,15 +3,15 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv = env.Clone()
+    myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
-	for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
-		if ARGUMENTS.get(i.lower(), False) :
-			myenv["ENV"][i] = ARGUMENTS[i.lower()]
-		elif os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
+        if ARGUMENTS.get(i.lower(), False) :
+            myenv["ENV"][i] = ARGUMENTS[i.lower()]
+        elif os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	tester = myenv.Program("ConcurrentFileTransferTest", ["ConcurrentFileTransferTest.cpp"])
-	myenv.Test(tester, "system")
+    tester = myenv.Program("ConcurrentFileTransferTest", ["ConcurrentFileTransferTest.cpp"])
+    myenv.Test(tester, "system")
diff --git a/Swiften/QA/DNSSDTest/SConscript b/Swiften/QA/DNSSDTest/SConscript
index d35d06f..275a314 100644
--- a/Swiften/QA/DNSSDTest/SConscript
+++ b/Swiften/QA/DNSSDTest/SConscript
@@ -3,19 +3,19 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.MergeFlags(myenv["CHECKER_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	if myenv.get("HAVE_BONJOUR", 0) :
-		myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
-	elif myenv.get("HAVE_AVAHI", 0) :
-		myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
-		myenv.MergeFlags(myenv["AVAHI_FLAGS"])
+    myenv = env.Clone()
+    myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["BOOST_FLAGS"])
+    myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+    if myenv.get("HAVE_BONJOUR", 0) :
+        myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
+    elif myenv.get("HAVE_AVAHI", 0) :
+        myenv.Append(CPPDEFINES = ["HAVE_AVAHI"])
+        myenv.MergeFlags(myenv["AVAHI_FLAGS"])
 
-	tester = myenv.Program("DNSSDTest", [
-			"DNSSDTest.cpp",
-		])
-	myenv.Test(tester, "system")
+    tester = myenv.Program("DNSSDTest", [
+            "DNSSDTest.cpp",
+        ])
+    myenv.Test(tester, "system")
diff --git a/Swiften/QA/FileTransferTest/SConscript b/Swiften/QA/FileTransferTest/SConscript
index 3275985..4b77674 100644
--- a/Swiften/QA/FileTransferTest/SConscript
+++ b/Swiften/QA/FileTransferTest/SConscript
@@ -3,18 +3,18 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv = env.Clone()
+    myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
-	for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
-		if ARGUMENTS.get(i.lower(), False) :
-			myenv["ENV"][i] = ARGUMENTS[i.lower()]
-		elif os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_FILETRANSFERTEST_JID", "SWIFT_FILETRANSFERTEST_PASS", "SWIFT_FILETRANSFERTEST2_JID", "SWIFT_FILETRANSFERTEST2_PASS"]:
+        if ARGUMENTS.get(i.lower(), False) :
+            myenv["ENV"][i] = ARGUMENTS[i.lower()]
+        elif os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	# test in-band transfers, direct SOCKS5 bytestream transfers and proxied SOCKS5 bytestream transfers
-	myenv["ENV"]["SWIFT_FILETRANSFERTEST_CONFIG"] = "1:1|2:2|4:4"
+    # test in-band transfers, direct SOCKS5 bytestream transfers and proxied SOCKS5 bytestream transfers
+    myenv["ENV"]["SWIFT_FILETRANSFERTEST_CONFIG"] = "1:1|2:2|4:4"
 
-	tester = myenv.Program("FileTransferTest", ["FileTransferTest.cpp"])
-	myenv.Test(tester, "system")
+    tester = myenv.Program("FileTransferTest", ["FileTransferTest.cpp"])
+    myenv.Test(tester, "system")
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index b090165..387bafc 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -3,20 +3,20 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	if "test_ipv6" in ARGUMENTS :
-		myenv.Append(CPPDEFINES = ["TEST_IPV6"])
-	myenv.MergeFlags(myenv["CHECKER_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv = env.Clone()
+    if "test_ipv6" in ARGUMENTS :
+        myenv.Append(CPPDEFINES = ["TEST_IPV6"])
+    myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
 
-	if env.get("unbound", False) :
-		myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
+    if env.get("unbound", False) :
+        myenv.Append(CPPDEFINES = ["USE_UNBOUND"])
 
-	tester = myenv.Program("NetworkTest", [
-			"BoostConnectionServerTest.cpp",
-			"BoostConnectionTest.cpp",
-			"DomainNameResolverTest.cpp",
-		])
-	myenv.Test(tester, "system", is_checker = True)
+    tester = myenv.Program("NetworkTest", [
+            "BoostConnectionServerTest.cpp",
+            "BoostConnectionTest.cpp",
+            "DomainNameResolverTest.cpp",
+        ])
+    myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/ProxyProviderTest/SConscript b/Swiften/QA/ProxyProviderTest/SConscript
index 2eb123d..3e28360 100644
--- a/Swiften/QA/ProxyProviderTest/SConscript
+++ b/Swiften/QA/ProxyProviderTest/SConscript
@@ -7,5 +7,5 @@ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
 myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
 myenv.Program("ProxyProviderTest", [
-		"ProxyProviderTest.cpp",
-	])
+        "ProxyProviderTest.cpp",
+    ])
diff --git a/Swiften/QA/ReconnectTest/SConscript b/Swiften/QA/ReconnectTest/SConscript
index 6db6a6f..a94af5e 100644
--- a/Swiften/QA/ReconnectTest/SConscript
+++ b/Swiften/QA/ReconnectTest/SConscript
@@ -3,23 +3,23 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
-	myenv.MergeFlags(myenv["ZLIB_FLAGS"])
-	myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
-	myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
-	myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
-	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
-#	myenv.Append(LIBPATH = ["/opt/local/lib"])
-#	myenv.Append(LIBS = ["efence"])
+    myenv = env.Clone()
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+    myenv.MergeFlags(myenv["BOOST_FLAGS"])
+    myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
+    myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+    myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+    myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
+    myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
+    myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+#   myenv.Append(LIBPATH = ["/opt/local/lib"])
+#   myenv.Append(LIBS = ["efence"])
 
-	for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
-		if os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+        if os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
-	myenv.Test(tester, "system", is_checker = True)
+    tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
+    myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index 2c588e5..2bb3e51 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -1,13 +1,13 @@
 Import("swiften_env")
 
 SConscript(dirs = [
-		"NetworkTest",
-#		"ReconnectTest",
-		"ClientTest",
-#		"DNSSDTest",
-		"StorageTest",
-		"TLSTest",
-		"ScriptedTests",
-		"ProxyProviderTest",
-		"FileTransferTest",
-	])
+        "NetworkTest",
+#       "ReconnectTest",
+        "ClientTest",
+#       "DNSSDTest",
+        "StorageTest",
+        "TLSTest",
+        "ScriptedTests",
+        "ProxyProviderTest",
+        "FileTransferTest",
+    ])
diff --git a/Swiften/QA/ScriptedTests/SConscript b/Swiften/QA/ScriptedTests/SConscript
index 298c455..ae315fe 100644
--- a/Swiften/QA/ScriptedTests/SConscript
+++ b/Swiften/QA/ScriptedTests/SConscript
@@ -1,7 +1,7 @@
 Import("env")
 
 if env["TEST"] :
-	env.ScriptTests([
-			"SendMessage.lua",
-			"MultipleClients.lua",
-		], "Swiften.QA.ScriptedTests", "system")
+    env.ScriptTests([
+            "SendMessage.lua",
+            "MultipleClients.lua",
+        ], "Swiften.QA.ScriptedTests", "system")
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index fff2a2b..bb1a2c6 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -3,20 +3,20 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.MergeFlags(myenv["CHECKER_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
-	myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
-	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+    myenv = env.Clone()
+    myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["BOOST_FLAGS"])
+    myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+    myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
+    myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
+    myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 
-	tester = myenv.Program("StorageTest", [
-			#"VCardFileStorageTest.cpp",
-			"FileReadBytestreamTest.cpp",
-			"FileWriteBytestreamTest.cpp",
-		])
-	myenv.Test(tester, "system", is_checker = True)
+    tester = myenv.Program("StorageTest", [
+            #"VCardFileStorageTest.cpp",
+            "FileReadBytestreamTest.cpp",
+            "FileWriteBytestreamTest.cpp",
+        ])
+    myenv.Test(tester, "system", is_checker = True)
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index 1a2e2c0..ba884e4 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -3,23 +3,23 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.MergeFlags(myenv["CHECKER_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	
-	if myenv.get("HAVE_OPENSSL", 0) :
-		myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
-		myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
-	elif myenv.get("HAVE_SCHANNEL", 0) :
-		myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
-	elif myenv.get("HAVE_SECURETRANSPORT", 0) :
-		myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
-	
-	tester = myenv.Program("TLSTest", [
-			"CertificateTest.cpp",
-			"CertificateErrorTest.cpp"
-		])
-	myenv.Test(tester, "system")
-\ No newline at end of file
+    myenv = env.Clone()
+    myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+
+    if myenv.get("HAVE_OPENSSL", 0) :
+        myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
+        myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+    elif myenv.get("HAVE_SCHANNEL", 0) :
+        myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
+    elif myenv.get("HAVE_SECURETRANSPORT", 0) :
+        myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
+
+    tester = myenv.Program("TLSTest", [
+            "CertificateTest.cpp",
+            "CertificateErrorTest.cpp"
+        ])
+    myenv.Test(tester, "system")
+\ No newline at end of file