[evolution-data-server/gnome-3-28] Check for ICAL_STATUS_DELETED status enum value
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-3-28] Check for ICAL_STATUS_DELETED status enum value
- Date: Mon, 21 May 2018 12:41:50 +0000 (UTC)
commit ae1d900f28b1869b1ba47b07f61b2369fde614f5
Author: Milan Crha <mcrha redhat com>
Date: Mon May 21 14:43:59 2018 +0200
Check for ICAL_STATUS_DELETED status enum value
CMakeLists.txt | 6 ++++++
config.h.in | 3 +++
src/calendar/libedata-cal/e-cal-backend-sexp.c | 4 ++++
src/calendar/libedata-cal/e-cal-cache.c | 4 ++++
4 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af26140..732d669 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -948,6 +948,12 @@ CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
return 0;
}" HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT)
+CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
+ int main(void) {
+ icalproperty_status_to_string (ICAL_STATUS_DELETED);
+ return 0;
+ }" HAVE_ICAL_STATUS_DELETED)
+
unset(CMAKE_REQUIRED_DEFINITIONS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
diff --git a/config.h.in b/config.h.in
index d39555b..0b838a7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -180,6 +180,9 @@
/* libical provides icaltzutil_set_exact_vtimezones_support function */
#cmakedefine HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT 1
+/* libical has ICAL_STATUS_DELETED icalproperty_status value */
+#cmakedefine HAVE_ICAL_STATUS_DELETED 1
+
/* Define to 1 if you have the libgdata package */
#cmakedefine HAVE_LIBGDATA 1
diff --git a/src/calendar/libedata-cal/e-cal-backend-sexp.c b/src/calendar/libedata-cal/e-cal-backend-sexp.c
index cdbeb3c..2d46b29 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -591,6 +591,10 @@ matches_status (ECalComponent *comp ,const gchar *str)
return g_str_equal (str, "PENDING");
case ICAL_STATUS_FAILED:
return g_str_equal (str, "FAILED");
+#ifdef HAVE_ICAL_STATUS_DELETED
+ case ICAL_STATUS_DELETED:
+ return g_str_equal (str, "DELETED");
+#endif
case ICAL_STATUS_X:
break;
}
diff --git a/src/calendar/libedata-cal/e-cal-cache.c b/src/calendar/libedata-cal/e-cal-cache.c
index 510bbb3..d6e2d55 100644
--- a/src/calendar/libedata-cal/e-cal-cache.c
+++ b/src/calendar/libedata-cal/e-cal-cache.c
@@ -810,6 +810,10 @@ ecc_get_status_as_string (icalproperty_status status)
return "pending";
case ICAL_STATUS_FAILED:
return "failed";
+#ifdef HAVE_ICAL_STATUS_DELETED
+ case ICAL_STATUS_DELETED:
+ return "deleted";
+#endif
case ICAL_STATUS_X:
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]