summaryrefslogtreecommitdiffstats
path: root/libemailfunctions
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /libemailfunctions
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libemailfunctions')
-rw-r--r--libemailfunctions/email.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index b5148736f..0f6b83617 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -685,7 +685,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
}else if( bInQuotesOutsideOfEmail ){
if( cQuotes == c )
bInQuotesOutsideOfEmail = false;
- else
+ else if ( c != '\\' )
name.prepend( c );
}else{
// found the start of this addressee ?
@@ -695,8 +695,9 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
if( iMailStart ){
if( cQuotes == c )
bInQuotesOutsideOfEmail = true; // end of quoted text found
- else
+ else {
name.prepend( c );
+ }
}else{
switch( c ){
case '<':
@@ -751,7 +752,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
}else if( bInQuotesOutsideOfEmail ){
if( cQuotes == c )
bInQuotesOutsideOfEmail = false;
- else
+ else if ( c != '\\' )
name.append( c );
}else{
// found the end of this addressee ?
@@ -809,16 +810,22 @@ TQString KPIM::normalizedAddress( const TQString & displayName,
const TQString & addrSpec,
const TQString & comment )
{
- if ( displayName.isEmpty() && comment.isEmpty() )
+ TQString realDisplayName = displayName;
+ realDisplayName.remove( TQChar( 0x202D ) );
+ realDisplayName.remove( TQChar( 0x202E ) );
+ realDisplayName.remove( TQChar( 0x202A ) );
+ realDisplayName.remove( TQChar( 0x202B ) );
+
+ if ( realDisplayName.isEmpty() && comment.isEmpty() )
return addrSpec;
else if ( comment.isEmpty() )
- return quoteNameIfNecessary( displayName ) + " <" + addrSpec + ">";
- else if ( displayName.isEmpty() ) {
+ return quoteNameIfNecessary( realDisplayName ) + " <" + addrSpec + ">";
+ else if ( realDisplayName.isEmpty() ) {
TQString commentStr = comment;
return quoteNameIfNecessary( commentStr ) + " <" + addrSpec + ">";
}
else
- return displayName + " (" + comment + ") <" + addrSpec + ">";
+ return realDisplayName + " (" + comment + ") <" + addrSpec + ">";
}