[pan2] quick bugfix for base64 f***up

[Heinrich MÃller <henmull src gnome org>]

commit fa6d4fa0e347409b6f63e6e1f702847c9fa90ac6
Author: Heinrich MÃller <henmull src gnome org>
Date:   Fri Feb 17 10:41:31 2012 +0100

    quick bugfix for base64 f***up

 pan/usenet-utils/mime-utils.cc |   43 ++++++++++++++++++++-------------------
 pan/usenet-utils/mime-utils.h  |    2 -
 2 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 1ade4fa..9980f9e 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -480,10 +480,11 @@ enum EncType
 {
 	ENC_PLAIN ,
 	ENC_YENC,
-	ENC_UU,
-	ENC_BASE64,
-	ENC_QP,
-	ENC_HTML
+	ENC_UU
+//	,
+//	ENC_BASE64,
+//	ENC_QP,
+//	ENC_HTML
 };
 
 namespace pan
@@ -562,13 +563,13 @@ namespace pan
             part->filter = g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_UUENCODE, FALSE);
             break;
 
-          case ENC_BASE64:
-            part->filter = g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_BASE64, FALSE);
-            break;
-
-          case ENC_QP:
-            part->filter = g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE, FALSE);
-            break;
+//          case ENC_BASE64:
+//            part->filter = g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_BASE64, FALSE);
+//            break;
+//
+//          case ENC_QP:
+//            part->filter = g_mime_filter_basic_new (GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE, FALSE);
+//            break;
 
           case ENC_YENC:
             part->filter = g_mime_filter_yenc_new (FALSE);
@@ -627,15 +628,15 @@ namespace pan
       switch (type)
       {
 
-        case ENC_QP:
-          sub_begin = linestart_pos;
-          cur = new TempPart(type = ENC_QP);
-          break;
-
-        case ENC_BASE64:
-          sub_begin = linestart_pos;
-          cur = new TempPart(type = ENC_BASE64);
-          break;
+//        case ENC_QP:
+//          sub_begin = linestart_pos;
+//          cur = new TempPart(type = ENC_QP);
+//          break;
+//
+//        case ENC_BASE64:
+//          sub_begin = linestart_pos;
+//          cur = new TempPart(type = ENC_BASE64);
+//          break;
 
         case ENC_PLAIN:
         {
@@ -727,7 +728,7 @@ namespace pan
           else if (cur == NULL)
           {
             sub_begin = linestart_pos;
-            cur = new TempPart(type = ENC_HTML);
+            cur = new TempPart(type = type);
 
           }
           break;
diff --git a/pan/usenet-utils/mime-utils.h b/pan/usenet-utils/mime-utils.h
index c2cfa47..021ee2b 100644
--- a/pan/usenet-utils/mime-utils.h
+++ b/pan/usenet-utils/mime-utils.h
@@ -67,8 +67,6 @@
 namespace pan
 {
 
-  std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len);
-  std::string base64_decode(std::string const& encoded_string);
 #ifdef HAVE_GMIME_CRYPTO
   GMimeMessage* message_add_signed_part (const std::string& uid, const std::string& body_str, GMimeMessage* body);
   GMimeMessage* gpg_encrypt (const std::string& uid, const std::string& body_str, GMimeMessage* body, GPtrArray* rcp, bool sign);