* 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, 9 insertions, 0 deletions

diff --git a/mimelib/dw_mime.cpp b/mimelib/dw_mime.cpp
index 39f75f639..cca2fdede 100644
--- a/mimelib/dw_mime.cpp
+++ b/mimelib/dw_mime.cpp
@@ -215,6 +215,9 @@ int DwSubtypeStrToEnum(const DwString& aStr)
         if (DwStrcasecmp(aStr, "digest") == 0) {
             type = DwMime::kSubtypeDigest;
         }
+        if (DwStrcasecmp(aStr, "directory") == 0) {
+            type = DwMime::kSubtypeDirectory;
+        }
 	else if (DwStrcasecmp(aStr, "disposition-notification") == 0 ) {
 	    type = DwMime::kSubtypeDispositionNotification;
 	}
@@ -341,6 +344,9 @@ int DwSubtypeStrToEnum(const DwString& aStr)
         if (DwStrcasecmp(aStr, "x-diff") == 0) {
             type = DwMime::kSubtypeXDiff;
         }
+        if (DwStrcasecmp(aStr, "x-vcalendar") == 0) {
+            type = DwMime::kSubtypeVCal;
+        }
         break;
     }
     return type;
@@ -375,6 +381,9 @@ void DwSubtypeEnumToStr(int aEnum, DwString& aStr)
     case DwMime::kSubtypeXVCard:
         aStr = "X-VCard";
         break;
+    case DwMime::kSubtypeDirectory:
+        aStr = "Directory";
+        break;
     case DwMime::kSubtypeXDiff:
         aStr = "X-Diff";
         break;