| author | llornkcor <llornkcor> | 2003-04-06 19:03:38 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-04-06 19:03:38 (UTC) |
| commit | e6023e382d816195ff209b421f58ed5abfffe0e9 (patch) (side-by-side diff) | |
| tree | 786e10ac117b17f2eee1bfbaec9a1027a33e969a | |
| parent | b284e2c4dcddc4314f94933616d664b08587e29e (diff) | |
| download | opie-e6023e382d816195ff209b421f58ed5abfffe0e9.zip opie-e6023e382d816195ff209b421f58ed5abfffe0e9.tar.gz opie-e6023e382d816195ff209b421f58ed5abfffe0e9.tar.bz2 | |
grumble
| -rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 4 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index a086dfc..2144899 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -172,32 +172,32 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" pos = in.find(delimiter, 0, FALSE); header = in.left(pos); body = in.right(in.length() - pos - delimiter.length()); if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) body.truncate(body.length()-2); TextParser p(header, lineShift); if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { pos++; if (p.separatorAt(pos) == ' ') { - mail->from = p.getString(&pos, '<'); + mail->from = p.getString(&pos, '<', false); mail->from = mail->from.stripWhiteSpace(); if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { mail->from = mail->from.left(mail->from.length() - 1); mail->from = mail->from.right(mail->from.length() - 1); } pos++; - mail->fromMail = p.getString(&pos, '>'); + mail->fromMail = p.getString(&pos, '>', false); } else { if ((p.separatorAt(pos) == '<') || (p.separatorAt(pos) == ' ')) //No name.. nasty pos++; pos++; mail->fromMail = p.getString(&pos, 'z', TRUE); if (mail->fromMail.at(mail->fromMail.length()-1) == '>') mail->fromMail.truncate(mail->fromMail.length() - 1); mail->from=mail->fromMail; } } if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index a086dfc..2144899 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -172,32 +172,32 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" pos = in.find(delimiter, 0, FALSE); header = in.left(pos); body = in.right(in.length() - pos - delimiter.length()); if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) body.truncate(body.length()-2); TextParser p(header, lineShift); if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { pos++; if (p.separatorAt(pos) == ' ') { - mail->from = p.getString(&pos, '<'); + mail->from = p.getString(&pos, '<', false); mail->from = mail->from.stripWhiteSpace(); if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { mail->from = mail->from.left(mail->from.length() - 1); mail->from = mail->from.right(mail->from.length() - 1); } pos++; - mail->fromMail = p.getString(&pos, '>'); + mail->fromMail = p.getString(&pos, '>', false); } else { if ((p.separatorAt(pos) == '<') || (p.separatorAt(pos) == ' ')) //No name.. nasty pos++; pos++; mail->fromMail = p.getString(&pos, 'z', TRUE); if (mail->fromMail.at(mail->fromMail.length()-1) == '>') mail->fromMail.truncate(mail->fromMail.length() - 1); mail->from=mail->fromMail; } } if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { |