From d5945b15714bc8214044ff727fc6da1321d90cef Mon Sep 17 00:00:00 2001
From: Don Sanders <don@sanders.org>
Date: Thu, 27 Jan 2000 07:47:41 +0000
Subject: [PATCH] An assortment of patches from Daniel.

svn path=/trunk/kdenetwork/kmail/; revision=39332
---
 kmcomposewin.cpp | 2 +-
 kmfilter.cpp     | 1 -
 kmmessage.cpp    | 2 +-
 main.cpp         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 56bd8ea58..4c32d6cf2 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -1710,7 +1710,7 @@ void KMComposeWin::slotAppendSignature()
 
   if (!sigText.isEmpty())
   {
-    mEditor->insertLine("--", -1);
+    mEditor->insertLine("-- ", -1);
     mEditor->insertLine(sigText, -1);
     mEditor->setModified(mod);
   }
diff --git a/kmfilter.cpp b/kmfilter.cpp
index a476f7549..526b02d39 100644
--- a/kmfilter.cpp
+++ b/kmfilter.cpp
@@ -73,7 +73,6 @@ KMFilter::~KMFilter()
 bool KMFilter::matches(const KMMessage* msg)
 {
   bool matchesA, matchesB;
-  cout << "," << endl;
 
   matchesA = mRuleA.matches(msg);
   if (mOperator==OpIgnore) return matchesA;
diff --git a/kmmessage.cpp b/kmmessage.cpp
index 73a31b84b..bce82bc21 100644
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@@ -691,7 +691,7 @@ KMMessage* KMMessage::createReply(bool replyToAll)
       pos1 = ccStr.findRev(", ", i);
       if( pos1 == -1 ) pos1 = 0;
       pos2 = ccStr.find(", ", i);
-      ccStr = ccStr.left(pos1) + toStr.right(ccStr.length() - pos2 - 1); //Daniel
+      ccStr = ccStr.left(pos1) + ccStr.right(ccStr.length() - pos2 - 1); //Daniel
     }
     ccStr.truncate(ccStr.length()-2);
 
diff --git a/main.cpp b/main.cpp
index ff18e2ca4..33de3ebc1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -409,7 +409,7 @@ static void transferMail(void)
   rc = KMessageBox::questionYesNo(NULL, 
          i18n(
 	    "The directory ~/KMail exists. From now on, KMail uses the\n"
-	    "directory ~/Mail for it's messages.\n"
+	    "directory ~/Mail for its messages.\n"
 	    "KMail can move the contents of the directory ~/KMail into\n"
 	    "~/Mail, but this will replace existing files with the same\n"
 	    "name in the directory ~/Mail (e.g. inbox).\n\n"