From 6f12e54967e4b2ef415231c034ee4d98d5b4183b Mon Sep 17 00:00:00 2001
From: Markus Wuebben <markus.wuebben@kde.org>
Date: Sat, 21 Jun 1997 14:12:42 +0000
Subject: [PATCH] Minor changes to support mime msg replying/forwarding

svn path=/trunk/kdenetwork/kmail/; revision=259
---
 kmcomposewin.cpp | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index ab799f331..6168bcf16 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -307,14 +307,13 @@ void KMComposeView::forwardMessage()
           temp.sprintf("Subject: %s\n", subject);
           editor->append(temp);
           if(!currentMessage->numAttch())
-                  {printf("Message is none MULTIPART\n");
-                  temp = currentMessage->getText(&length);
+                  {temp = currentMessage->getText(&length);
                   editor->append(temp);
                   }
         else
-                {printf("Message is MULTIPART!\n");
-		//temp = currentMessage->getText(&length);
-                //editor->append(temp);
+		{temp = currentMessage->getText(&length);
+		temp.truncate(length);
+                editor->append(temp);
                 }
           editor->update();
           editor->repaint();
@@ -341,16 +340,20 @@ void KMComposeView::replyAll()
           toLEdit->setText(from);
 	  ccLEdit->setText(cc);
           subjLEdit->setText(temp);
-	  printf("Checkion if replyAll is MP\n");
           if(!currentMessage->numAttch())
-                  {printf("No, it is not a MP message\n");
-		  temp.sprintf("\nOn %s %s wrote:\n",from ,date);
+		  {temp.sprintf("\nOn %s %s wrote:\n",from ,date);
                   editor->append(temp);
                   temp = currentMessage->getText(&length);
                   editor->append(temp);
-		  printf("Leaving test\n");
                   }
-          printf("After\n");
+	  else
+		{temp.sprintf("\nOn %s %s wrote:\n",from ,date);
+                 editor->append(temp);
+		temp = currentMessage->getText(&length);
+		temp.truncate(length);
+		editor->append(temp);
+		}
+
           lines = editor->numLines();
           printf("We are here\n");
           for(int x=2;x < lines;x++)
@@ -381,16 +384,21 @@ void KMComposeView::replyMessage()
           temp.sprintf("Re: %s",subject);
           toLEdit->setText(from);
           subjLEdit->setText(temp);
-	  printf("Checking if msg is MP\n");
 	  if(!currentMessage->numAttch())
-	          {printf("Yes, it is a MP mes\n");
-		  temp.sprintf("\nOn %s %s wrote:\n",date ,from);
+	          {temp.sprintf("\nOn %s %s wrote:\n",date ,from);
 		  editor->append(temp);
 		  temp =  currentMessage->getText(&length);
         	  editor->append(temp);
-		  printf("Leaving cM->gA()\n");
 		  }
-	  printf("After\n");
+	  else 
+		{temp.sprintf("\nOn %s %s wrote:\n",from ,date);
+                editor->append(temp);
+		temp = currentMessage->getText(&length);
+		temp.truncate(length);
+		editor->append(temp);
+		}
+
+		  
           lines = editor->numLines();
           printf("We are here\n");
           for(int x=2;x < lines;x++)