Branch 'libkolabxml-1.0' - src/containers src/xcalconversions.h

[Christian Mollekopf]

 src/containers/kolabcontainers.h |    4 +++-
 src/xcalconversions.h            |   10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1b064c60765902c3cb862ffe073eb869ace70b5f
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Aug 25 11:28:00 2014 +0200

    Support for PARTSTAT INPROCESS and DELEGATED.
    
    Patch by Thomas Brüderli.
    
    Conflicts:
    	src/python/test.py

diff --git a/src/containers/kolabcontainers.h b/src/containers/kolabcontainers.h
index 7bd1d2b..af44c24 100644
--- a/src/containers/kolabcontainers.h
+++ b/src/containers/kolabcontainers.h
@@ -336,7 +336,9 @@ enum PartStatus {
     PartAccepted,
     PartDeclined,
     PartTentative,
-    PartDelegated
+    PartDelegated,
+    PartInProcess,
+    PartCompleted
 };
 
 enum Role {
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index b30053f..176470c 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -75,6 +75,8 @@ const char* const PARTDECLINED = "DECLINED";
 const char* const PARTDELEGATED = "DELEGATED";
 const char* const PARTNEEDSACTION = "NEEDS-ACTION";
 const char* const PARTTENTATIVE = "TENTATIVE";
+const char* const PARTINPROCESS = "IN-PROCESS";
+const char* const PARTCOMPLETED = "COMPLETED";
 
 const char* const CHAIR = "CHAIR";
 const char* const NONPARTICIPANT = "NON-PARTICIPANT";
@@ -600,6 +602,10 @@ std::string mapPartStat(PartStatus status)
             return PARTNEEDSACTION;
         case PartTentative:
             return PARTTENTATIVE;
+        case PartInProcess:
+            return PARTINPROCESS;
+        case PartCompleted:
+            return PARTCOMPLETED;
     }
     ERROR("PartStat not handled: " + status);
     return std::string();
@@ -617,6 +623,10 @@ PartStatus mapPartStat(const std::string &status)
         return PartNeedsAction;
     } else if (status == PARTTENTATIVE) {
         return PartTentative;
+    } else if (status == PARTINPROCESS) {
+        return PartInProcess;
+    } else if (status == PARTCOMPLETED) {
+        return PartCompleted;
     }
     ERROR("PartStat not handled: " + status);
     return PartNeedsAction;