Branch 'libkolabxml-1.0' - 3 commits - src/csharp src/java src/kolabformat.i src/objectvalidation.cpp src/xcalconversions.h
Christian Mollekopf
mollekopf at kolabsys.com
Fri May 16 17:56:14 CEST 2014
src/csharp/CMakeLists.txt | 1 +
src/java/CMakeLists.txt | 1 +
src/kolabformat.i | 1 +
src/objectvalidation.cpp | 2 +-
src/xcalconversions.h | 5 +++--
5 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 2d3f2bba84818a9c9fa93bfbddbe8495b7991780
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Fri May 16 17:53:37 2014 +0200
Use COMPLETED for the completed status instead of OPAQUE.
The OPAQUE value get's translated to completed for backwards compatibility.
BUG: 3024
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index 923646b..3fd982d 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -57,7 +57,8 @@ const char* const THISANDFUTURE = "THISANDFUTURE";
const char* const BASE64 = "BASE64";
const char* const NEEDSACTION = "NEEDS-ACTION";
-const char* const COMPLETED = "OPAQUE";
+const char* const COMPLETED = "COMPLETED";
+const char* const COMPLETED_COMPAT = "OPAQUE";
const char* const INPROCESS = "IN-PROCESS";
const char* const CANCELLED = "CANCELLED";
const char* const TENTATIVE = "TENTATIVE";
@@ -846,7 +847,7 @@ void setIncidenceProperties(I &inc, const T &prop)
const std::string &status = toString(*prop.status());
if (status == NEEDSACTION) {
inc.setStatus(StatusNeedsAction);
- } else if (status == COMPLETED) {
+ } else if (status == COMPLETED || status == COMPLETED_COMPAT) {
inc.setStatus(StatusCompleted);
} else if (status == INPROCESS) {
inc.setStatus(StatusInProcess);
commit dd3e8d09d596b18795066f98f8770abfb3122d3a
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Fri May 16 17:43:55 2014 +0200
Defined vectorsnippet which is required for snippets.
diff --git a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
index c10bb2b..5e778fe 100644
--- a/src/csharp/CMakeLists.txt
+++ b/src/csharp/CMakeLists.txt
@@ -67,6 +67,7 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/vectorkey.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.cs
${CMAKE_CURRENT_BINARY_DIR}/vectors.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.cs
${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorurl.cs
${CMAKE_CURRENT_BINARY_DIR}/Weekday.cs
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index cdc63f5..c54f5e3 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -56,6 +56,7 @@ set(KOLAB_SWIG_JAVA_FILES
${CMAKE_CURRENT_BINARY_DIR}/vectorkey.java
${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.java
${CMAKE_CURRENT_BINARY_DIR}/vectors.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.java
${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.java
${CMAKE_CURRENT_BINARY_DIR}/vectorurl.java
${CMAKE_CURRENT_BINARY_DIR}/Weekday.java
diff --git a/src/kolabformat.i b/src/kolabformat.i
index f2ffd6c..eda4c84 100644
--- a/src/kolabformat.i
+++ b/src/kolabformat.i
@@ -44,6 +44,7 @@ namespace std {
%template(vectorurl) vector<Kolab::Url>;
%template(vectorkey) vector<Kolab::Key>;
%template(vectorcategorycolor) vector<Kolab::CategoryColor>;
+ %template(vectorsnippet) vector<Kolab::Snippet>;
};
%rename(readKolabFile) Kolab::readFile;
commit c875e59e2497a71f1beccbfe28410789d8867830
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Feb 27 14:46:23 2014 +0100
Print the invalid timezone as part of the error message.
diff --git a/src/objectvalidation.cpp b/src/objectvalidation.cpp
index e6a1464..8ea0a04 100644
--- a/src/objectvalidation.cpp
+++ b/src/objectvalidation.cpp
@@ -51,7 +51,7 @@ bool isValid(const cDateTime &datetime)
return false;
}
if (tzSet.find(tz) == tzSet.end()) {
- Utils::logMessage("not a valid olson timezone.", "", 0, Error);
+ Utils::logMessage("Not a valid olson timezone: " + tz, "", 0, Error);
return false;
}
}
More information about the commits
mailing list