[evolution-data-server/wip/mcrha/libical-glib] Misc post-merge changes

[Milan Crha <mcrha src gnome org>]

commit fb5d44c9032a8832d5fcec4669d4b6c5fc2cb1f6
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 13 15:26:58 2019 +0100

    Misc post-merge changes
    
    - applied skipped commit cf2c5e0f02ceaa01a33115164fe7c641b87435b7
    - added EBackend .gir into EDataCal gir
    - disabled vala bindings for EDataCal

 src/calendar/libecal/e-cal-util.c        |  3 ++-
 src/calendar/libecal/e-cal-util.h        | 10 ++++++++++
 src/calendar/libedata-cal/CMakeLists.txt |  1 +
 src/vala/CMakeLists.txt                  | 19 +++++++++++++++++--
 4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/src/calendar/libecal/e-cal-util.c b/src/calendar/libecal/e-cal-util.c
index 45d515036..bd9e6b033 100644
--- a/src/calendar/libecal/e-cal-util.c
+++ b/src/calendar/libecal/e-cal-util.c
@@ -2404,7 +2404,8 @@ e_cal_util_mark_task_complete_sync (ICalComponent *vtodo,
        g_return_val_if_fail (i_cal_component_isa (vtodo) == I_CAL_VTODO_COMPONENT, FALSE);
        g_return_val_if_fail (E_IS_CAL_CLIENT (cal_client), FALSE);
 
-       if (e_cal_util_component_has_recurrences (vtodo)) {
+       if (e_cal_util_component_has_recurrences (vtodo) &&
+           !e_client_check_capability (E_CLIENT (cal_client), E_CAL_STATIC_CAPABILITY_TASK_HANDLE_RECUR)) {
                gboolean is_last = FALSE, change_count = FALSE;
                ICalTimetype *new_dtstart = NULL, *new_due = NULL;
 
diff --git a/src/calendar/libecal/e-cal-util.h b/src/calendar/libecal/e-cal-util.h
index 1f77d31a4..93a5bef5a 100644
--- a/src/calendar/libecal/e-cal-util.h
+++ b/src/calendar/libecal/e-cal-util.h
@@ -189,6 +189,16 @@ G_BEGIN_DECLS
  **/
 #define E_CAL_STATIC_CAPABILITY_COMPONENT_COLOR                "component-color"
 
+/**
+ * E_CAL_STATIC_CAPABILITY_TASK_HANDLE_RECUR:
+ *
+ * When the capability is set, the backend handles task recurrence
+ * completion on its own. This does not imply E_CAL_STATIC_CAPABILITY_TASK_CAN_RECUR.
+ *
+ * Since: 3.34
+ **/
+#define E_CAL_STATIC_CAPABILITY_TASK_HANDLE_RECUR      "task-handle-recur"
+
 struct _ECalClient;
 
 ICalComponent *        e_cal_util_new_top_level        (void);
diff --git a/src/calendar/libedata-cal/CMakeLists.txt b/src/calendar/libedata-cal/CMakeLists.txt
index 18f1a32a5..213de6178 100644
--- a/src/calendar/libedata-cal/CMakeLists.txt
+++ b/src/calendar/libedata-cal/CMakeLists.txt
@@ -113,6 +113,7 @@ set(gir_libs
 set(gir_deps
        ${CMAKE_BINARY_DIR}/src/camel/Camel-${API_VERSION}.gir
        ${CMAKE_BINARY_DIR}/src/libedataserver/EDataServer-${API_VERSION}.gir
+       ${CMAKE_BINARY_DIR}/src/libebackend/EBackend-${API_VERSION}.gir
        ${CMAKE_BINARY_DIR}/src/calendar/libecal/ECal-${CAL_API_VERSION}.gir
 )
 
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index c2066a615..0f4b76543 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -1,3 +1,7 @@
+# disabled until some issues are fixed;
+# when fixed, then remove the conditions below and build the vala bindings unconditionally
+set(ENABLE_DATACAL 0)
+
 set(valafiles
        ${CMAKE_CURRENT_SOURCE_DIR}/camel-${API_VERSION}.deps
        ${CMAKE_CURRENT_BINARY_DIR}/camel-${API_VERSION}.vapi
@@ -9,10 +13,15 @@ set(valafiles
        ${CMAKE_CURRENT_BINARY_DIR}/libebook-contacts-${API_VERSION}.vapi
        ${CMAKE_CURRENT_SOURCE_DIR}/libecal-${CAL_API_VERSION}.deps
        ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}.vapi
-       ${CMAKE_CURRENT_SOURCE_DIR}/libedata-cal-${CAL_API_VERSION}.deps
-       ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VERSION}.vapi
 )
 
+if(ENABLE_DATACAL)
+       list(APPEND valafiles
+               ${CMAKE_CURRENT_SOURCE_DIR}/libedata-cal-${CAL_API_VERSION}.deps
+               ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VERSION}.vapi
+       )
+endif(ENABLE_DATACAL)
+
 if(HAVE_GTK)
        list(APPEND valafiles
                ${CMAKE_CURRENT_SOURCE_DIR}/libedataserverui-${API_VERSION}.deps
@@ -205,6 +214,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}
 # libedata-cal
 # ***********************************
 
+if(ENABLE_DATACAL)
 set(gir_fullname ${CMAKE_BINARY_DIR}/src/calendar/libedata-cal/EDataCal-${CAL_API_VERSION}.gir)
 gir_girfilename_to_target(gir_deps EDataCal-${CAL_API_VERSION}.gir)
 
@@ -215,9 +225,12 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VER
                --vapidir=${CMAKE_CURRENT_SOURCE_DIR}
                --vapidir=${CMAKE_CURRENT_BINARY_DIR}
                --girdir=${CMAKE_BINARY_DIR}/src/camel
+               --girdir=${CMAKE_BINARY_DIR}/src/libebackend
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
                --girdir=${CMAKE_BINARY_DIR}/src/calendar/libecal
+               --girdir=${CMAKE_BINARY_DIR}/src/calendar/libedata-cal
                --pkg libedataserver-${API_VERSION}
+               --pkg libebackend-${API_VERSION}
                --pkg libecal-${CAL_API_VERSION}
                --pkg gio-2.0
                --pkg libxml-2.0
@@ -228,10 +241,12 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VER
                ${gir_fullname}
        DEPENDS libedata-cal-${CAL_API_VERSION}.deps
                ${CMAKE_CURRENT_BINARY_DIR}/libedataserver-${API_VERSION}.vapi
+               ${CMAKE_CURRENT_BINARY_DIR}/libebackend-${API_VERSION}.vapi
                ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}.vapi
                ${gir_fullname}
                ${gir_deps}
 )
+endif(ENABLE_DATACAL)
 
 # ***********************************
 # Install all VAPI files