* 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

1 files changed, 1 insertions, 81 deletions

diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index 60913c9fc..f036a193b 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -729,87 +729,6 @@ static TQCString automaticDetectionForWesternEuropean( const unsigned char* ptr,
     return "";
 }
 
-// Other browsers allow comments in the head section, so we need to also.
-// It's important not to look for tags inside the comments.
-static void skipComment(const char *&ptr, const char *pEnd)
-{
-    const char *p = ptr;
-    // Allow <!-->; other browsers do.
-    if (*p=='>')
-    {
-        p++;
-    }
-    else
-    {
-        while (p!=pEnd)
-        {
-            if (*p=='-')
-            {
-                // This is the real end of comment, "-->".
-                if (p[1]=='-' && p[2]=='>')
-                {
-                    p += 3;
-                    break;
-                }
-                // This is the incorrect end of comment that other browsers allow, "--!>".
-                if (p[1] == '-' && p[2] == '!' && p[3] == '>')
-                {
-                    p += 4;
-                    break;
-                }
-            }
-            p++;
-        }
-    }
-    ptr=p;
-}
-
-// Returns the position of the encoding string.
-static int findXMLEncoding(const TQCString &str, int &encodingLength)
-{
-    int len = str.length();
-    int pos = str.find("encoding");
-    if (pos == -1)
-        return -1;
-    pos += 8;
-
-    // Skip spaces and stray control characters.
-    while (pos<len && str[pos]<=' ')
-        ++pos;
-
-    //Bail out if nothing after
-    // Skip equals sign.
-    if (pos>=len || str[pos] != '=')
-        return -1;
-    ++pos;
-
-    // Skip spaces and stray control characters.
-    while (pos<len && str[pos]<=' ')
-        ++pos;
-
-    //Bail out if nothing after
-    if (pos >= len)
-        return -1;
-
-    // Skip quotation mark.
-    char quoteMark = str[pos];
-    if (quoteMark != '"' && quoteMark != '\'')
-        return -1;
-    ++pos;
-
-    // Find the trailing quotation mark.
-    int end=pos;
-    while (end<len && str[end]!=quoteMark)
-        ++end;
-
-    if (end>=len)
-        return -1;
-
-    encodingLength = end-pos;
-    return pos;
-}
-
-
 bool EncodingDetector::errorsIfUtf8 (const char* data, int length)
 {
     if (d->m_codec->mibEnum()!=MibUtf8)
@@ -905,6 +824,7 @@ EncodingDetector::EncodingChoiceSource EncodingDetector::encodingChoiceSource()
 const char* EncodingDetector::encoding() const
 {
     d->m_storeDecoderName = d->m_codec->name();
+    d->m_storeDecoderName = d->m_storeDecoderName.lower().replace( "iso ", "iso-" );
     return d->m_storeDecoderName.data();
 }