Diffstat (limited to 'kmicromail/libmailwrapper/mailtypes.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/mailtypes.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp index 1a4ffd1..af3b9d0 100644 --- a/kmicromail/libmailwrapper/mailtypes.cpp +++ b/kmicromail/libmailwrapper/mailtypes.cpp | |||
@@ -33,20 +33,26 @@ static bool stringCompareRec( const QString& s1, const QString& s2 ) | |||
33 | bool RecMail::isEqual( RecMail* r1 ) | 33 | bool RecMail::isEqual( RecMail* r1 ) |
34 | { | 34 | { |
35 | if ( !stringCompareRec( isodate, r1->isodate ) ) { | 35 | if ( !stringCompareRec( isodate, r1->isodate ) ) { |
36 | // qDebug("date *%s* *%s* ", isodate.latin1(), r1->isodate.latin1()); | 36 | // qDebug("date *%s* *%s* ", isodate.latin1(), r1->isodate.latin1()); |
37 | return false; | 37 | return false; |
38 | } | 38 | } |
39 | if ( !stringCompareRec( from, r1->from ) ) { | 39 | if ( !stringCompareRec( subject.left(40), r1->subject.left(40) ) ) { |
40 | //qDebug("from *%s* *%s* ", from.latin1(), r1->from.latin1()); | 40 | //qDebug("sub *%s* *%s*", subject.latin1(), r1->subject.latin1()); |
41 | return false; | 41 | return false; |
42 | } | 42 | } |
43 | if ( !stringCompareRec( subject, r1->subject ) ) { | 43 | |
44 | //qDebug("sub "); | 44 | //qDebug("date *%s* *%s* ", isodate.latin1(), r1->isodate.latin1()); |
45 | if ( !stringCompareRec( from.left(40), r1->from.left(40)) ) { | ||
46 | if ( r1->from.find ( from ) < 0 ) { | ||
47 | if ( !stringCompareRec( from.simplifyWhiteSpace ().left(40), r1->from.simplifyWhiteSpace ().left(40)) ) { | ||
48 | //qDebug("from *%s* *%s* ", from.left(40).latin1(), r1->from.left(20).latin1()); | ||
45 | return false; | 49 | return false; |
46 | } | 50 | } |
51 | } | ||
52 | } | ||
47 | 53 | ||
48 | return true; | 54 | return true; |
49 | } | 55 | } |
50 | void RecMail::copy_old(const RecMail&old) | 56 | void RecMail::copy_old(const RecMail&old) |
51 | { | 57 | { |
52 | subject = old.subject; | 58 | subject = old.subject; |