Merge lp:~zorba-coders/zorba/new-base64-api-email into lp:zorba/email-module

[Paul J. Lucas]

Using the new Base64 API.

Using the new Base64 API.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp'
--- src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp	2013-06-12 13:36:28 +0000
+++ src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp	2013-07-30 19:18:26 +0000
@@ -927,9 +927,9 @@
     aEncoding = ENC8BIT;
     if (!isTextOrXMLContentType(aContentType)) {
       // binary content needs to be base64 encoded for zorba
-      zorba::String lInput(aResult.c_str());
-      zorba::String lOutput = zorba::base64::encode(lInput);
-      aResult = lOutput.c_str();
+      std::string lOutput;
+      zorba::base64::encode(aResult, &lOutput);
+      aResult = lOutput;
     }
   }
   else if (aEncoding == ENCBASE64) {

=== modified file 'src/com/zorba-xquery/www/modules/email/smtp.xq.src/mime_handler.cpp'
--- src/com/zorba-xquery/www/modules/email/smtp.xq.src/mime_handler.cpp	2013-06-12 13:36:28 +0000
+++ src/com/zorba-xquery/www/modules/email/smtp.xq.src/mime_handler.cpp	2013-07-30 19:18:26 +0000
@@ -85,7 +85,8 @@
     // if string contains non-ascii chars, we encode it with
     // base64 encoding and generate a header value according to
     // http://tools.ietf.org/html/rfc2047 (MIME encoded-word syntax).
-    zorba::String lEncodedValue = zorba::base64::encode(aString);
+    zorba::String lEncodedValue;
+    zorba::base64::encode(aString, &lEncodedValue);
     zorba::String lFullValue = zorba::String("=?UTF-8?B?") 
                              + lEncodedValue 
                              + zorba::String("?=");