This file is part of mingw-cross-env.
See doc/index.html for further information.

diff -urN a/SConstruct b/SConstruct
--- a/SConstruct	2010-05-10 21:21:02.535809341 +0200
+++ b/SConstruct	2010-05-10 21:21:28.163800740 +0200
@@ -1071,7 +1071,7 @@
 	# Generate pkg-config file for shared and static library
 	vmime_pc_in = open(packageVersionedGenericName + ".pc.in", 'w')
 	vmime_pc_in.write("# File automatically generated by SConstruct ('scons autotools')\n")
-	vmime_pc_in.write("# DOT NOT EDIT!\n")
+	vmime_pc_in.write("# DO NOT EDIT!\n")
 	vmime_pc_in.write("\n")
 	vmime_pc_in.write("prefix=@prefix@\n")
 	vmime_pc_in.write("exec_prefix=@exec_prefix@\n")
@@ -1091,7 +1091,7 @@
 	Makefile_am = open("Makefile.am", 'w')
 	Makefile_am.write("""
 # File automatically generated by SConstruct ('scons autotools')
-# DOT NOT EDIT!
+# DO NOT EDIT!
 
 BINDING =
 INCLUDE = vmime
@@ -1123,7 +1123,7 @@
 	Makefile_am = open("vmime/Makefile.am", 'w')
 	Makefile_am.write("""
 # File automatically generated by SConstruct ('scons autotools')
-# DOT NOT EDIT!
+# DO NOT EDIT!
 """)
 
 	#Makefile_am.write(packageVersionedName + "includedir = $(prefix)/include/@GENERIC_VERSIONED_LIBRARY_NAME@/@GENERIC_LIBRARY_NAME@\n")
@@ -1145,7 +1145,7 @@
 	Makefile_am = open("src/Makefile.am", 'w')
 	Makefile_am.write("""
 # File automatically generated by SConstruct ('scons autotools')
-# DOT NOT EDIT!
+# DO NOT EDIT!
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 INTERNALS =
@@ -1235,7 +1235,7 @@
 # configure.in
 
 # File automatically generated by SConstruct ('scons autotools')
-# DOT NOT EDIT!
+# DO NOT EDIT!
 
 # Init
 """)
diff -urN a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp
--- a/src/net/imap/IMAPConnection.cpp	2010-05-10 21:21:02.392809549 +0200
+++ b/src/net/imap/IMAPConnection.cpp	2010-05-10 21:21:28.163800740 +0200
@@ -156,7 +156,7 @@
 	const bool tlsRequired = HAS_PROPERTY(PROPERTY_CONNECTION_TLS_REQUIRED)
 		&& GET_PROPERTY(bool, PROPERTY_CONNECTION_TLS_REQUIRED);
 
-	if (!store->isSecuredConnection() && tls)  // only if not IMAPS
+	if (!store->isIMAPS() && tls)  // only if not IMAPS
 	{
 		try
 		{
diff -urN a/src/utility/encoder/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp
--- a/src/utility/encoder/encoderFactory.cpp	2010-05-10 21:21:02.431820130 +0200
+++ b/src/utility/encoder/encoderFactory.cpp	2010-05-10 21:21:28.163800740 +0200
@@ -46,6 +46,10 @@
 	registerName <sevenBitEncoder>("7bit");
 	registerName <eightBitEncoder>("8bit");
 	registerName <binaryEncoder>("binary");
+
+	// Also register some non-standard encoding names
+	registerName <sevenBitEncoder>("7-bit");
+	registerName <eightBitEncoder>("8-bit");
 }