An assortment of patches from Daniel.

svn path=/trunk/kdenetwork/kmail/; revision=39332
wilder-work
Don Sanders 27 years ago
parent f4752da6c8
commit d5945b1571
  1. 2
      kmcomposewin.cpp
  2. 1
      kmfilter.cpp
  3. 2
      kmmessage.cpp
  4. 2
      main.cpp

@ -1710,7 +1710,7 @@ void KMComposeWin::slotAppendSignature()
if (!sigText.isEmpty())
{
mEditor->insertLine("--", -1);
mEditor->insertLine("-- ", -1);
mEditor->insertLine(sigText, -1);
mEditor->setModified(mod);
}

@ -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;

@ -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);

@ -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"

Loading…
Cancel
Save