Merge lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid into lp:~laney/qtorganizer5-eds/eds3.16

[Renato Araujo Oliveira Filho]

Make sure that vivid build still working.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-18 11:32:43 +0000
+++ CMakeLists.txt	2015-07-14 00:56:12 +0000
@@ -13,8 +13,8 @@
 
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
-pkg_check_modules(EDATASERVER REQUIRED libedataserver-1.2>=3.16)
-pkg_check_modules(ECAL REQUIRED REQUIRED libecal-1.2>=3.16)
+pkg_check_modules(EDATASERVER REQUIRED libedataserver-1.2>=3.8)
+pkg_check_modules(ECAL REQUIRED REQUIRED libecal-1.2>=3.8)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -64,13 +64,19 @@
              PATHS /usr/lib/evolution/)
 find_program(GVFSD gvfsd
              PATHS /usr/lib/gvfs/)
+
+if(EDATASERVER_VERSION VERSION_LESS "3.16")
+    set(EVOLUTION_API_3_17 "0")
+    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
+    set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar4")
+else()
+    set(EVOLUTION_API_3_17 "1")
+    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
+    set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar7")
+endif()
+
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry")
-if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
-    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
-endif()
-
 add_subdirectory(organizer)
 if(DBUS_RUNNER)
     if(EVOLUTION_CALENDAR_FACTORY)
 
=== modified file 'config.h.in'
--- config.h.in	2015-06-18 11:32:43 +0000
+++ config.h.in	2015-07-14 00:56:12 +0000
@@ -1,9 +1,18 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#define TMP_DIR                     "@TMP_DIR@"
-#define EVOLUTION_CALENDAR_FACTORY  "@EVOLUTION_CALENDAR_FACTORY@"
-#define EVOLUTION_CALENDAR_SERVICE  "org.gnome.evolution.dataserver.Calendar7"
-#define QORGANIZER_DEV_PATH         "@CMAKE_BINARY_DIR@"
+#define TMP_DIR                         "@TMP_DIR@"
+#define EVOLUTION_CALENDAR_FACTORY      "@EVOLUTION_CALENDAR_FACTORY@"
+#define EVOLUTION_CALENDAR_SERVICE_NAME "@EVOLUTION_CALENDAR_SERVICE@"
+#define QORGANIZER_DEV_PATH             "@CMAKE_BINARY_DIR@"
+#define EVOLUTION_API_3_17               @EVOLUTION_API_3_17@
+
+#if EVOLUTION_API_3_17
+    #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
+            e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, -1, CANCELLABLE, ERROR)
+#else
+    #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
+            e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR)
+#endif
 
 #endif
 
=== modified file 'organizer/CMakeLists.txt'
--- organizer/CMakeLists.txt	2014-02-25 17:12:32 +0000
+++ organizer/CMakeLists.txt	2015-07-14 00:56:12 +0000
@@ -49,7 +49,7 @@
 )
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${ECAL_INCLUDE_DIRS}
 
=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2015-05-08 20:01:32 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-07-14 00:56:12 +0000
@@ -1944,12 +1944,9 @@
 {
     rule->freq = ICAL_MONTHLY_RECURRENCE;
 
-    QList<int> daysOfMonth = qRule.daysOfMonth().toList();
     int c = 0;
-    for (int d=1; d < ICAL_BY_MONTHDAY_SIZE; d++) {
-        if (daysOfMonth.contains(d)) {
-            rule->by_month_day[c++] = d;
-        }
+    Q_FOREACH(int daysOfMonth, qRule.daysOfMonth()) {
+        rule->by_month_day[c++] = daysOfMonth;
     }
     for (int d = c; d < ICAL_BY_MONTHDAY_SIZE; d++) {
         rule->by_month_day[d] = ICAL_RECURRENCE_ARRAY_MAX;
 
=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
--- organizer/qorganizer-eds-source-registry.cpp	2015-06-18 11:39:48 +0000
+++ organizer/qorganizer-eds-source-registry.cpp	2015-07-14 00:56:12 +0000
@@ -1,4 +1,5 @@
 #include "qorganizer-eds-source-registry.h"
+#include "config.h"
 
 #include <QtCore/QDebug>
 
@@ -177,7 +178,8 @@
         QOrganizerEDSCollectionEngineId *eid = m_collectionsMap[collectionId];
         if (eid) {
             GError *gError = 0;
-            client = e_cal_client_connect_sync(eid->m_esource, eid->m_sourceType, -1, 0, &gError);
+
+            client = E_CAL_CLIENT_CONNECT_SYNC(eid->m_esource, eid->m_sourceType, 0, &gError);
             if (gError) {
                 qWarning() << "Fail to connect with client" << gError->message;
                 g_error_free(gError);
 
=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2015-05-08 20:01:32 +0000
+++ tests/unittest/CMakeLists.txt	2015-07-14 00:56:12 +0000
@@ -22,8 +22,8 @@
 
     add_test(${TESTNAME}
              ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh ${DBUS_RUNNER} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TESTNAME}
-             ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_SOURCE_SERVICE_NAME}
-             ${EVOLUTION_SOURCE_REGISTRY}
+             ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_CALENDAR_SERVICE_NAME}
+             ${EVOLUTION_SOURCE_REGISTRY}  ${EVOLUTION_SOURCE_SERVICE_NAME}
              ${GVFSD})
 endmacro(declare_test testname)
 
 
=== modified file 'tests/unittest/eds-base-test.cpp'
--- tests/unittest/eds-base-test.cpp	2015-06-18 11:39:48 +0000
+++ tests/unittest/eds-base-test.cpp	2015-07-14 00:56:12 +0000
@@ -90,9 +90,8 @@
         calendar.reset(e_source_registry_ref_source(sourceRegistry.data(),
                                                     collectionId.toString().toUtf8().data()));
     }
-    GScopedPointer<EClient> client(e_cal_client_connect_sync(calendar.data(),
+    GScopedPointer<EClient> client(E_CAL_CLIENT_CONNECT_SYNC(calendar.data(),
                                                              E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
-                                                             -1, /* timeout */
                                                              0,
                                                              &error));
     if (error) {
 
=== modified file 'tests/unittest/run-eds-test.sh'
--- tests/unittest/run-eds-test.sh	2015-06-18 10:41:05 +0000
+++ tests/unittest/run-eds-test.sh	2015-07-14 00:56:12 +0000
@@ -7,8 +7,9 @@
 echo ARG4=$4 # full executable path of evolution-calendar-factory
 echo ARG5=$5 # bus service name of calendar factory
 echo ARG6=$6 # full exectuable path of evolution-source-registry
-echo ARG7=$7 # full executable path of gvfs
-echo ARG8=$8 # config files
+echo ARG7=$7 # bus service name of evolution-source-registry
+echo ARG7=$8 # full executable path of gvfs
+echo ARG8=$9 # config files
 
 # set up the tmpdir and tell the shell to purge it when we exit
 export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1
@@ -38,10 +39,9 @@
 
 # run dbus-test-runner
 $1 --keep-env --max-wait=90 \
---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar7 \
---task $4 --task-name "evolution" --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Sources4 -r \
+--task $2 --task-name $3 --wait-until-complete --wait-for=$5 \
+--task $4 --task-name "evolution" --wait-until-complete --wait-for=$7 -r \
 --task $6 --task-name "source-registry" -r
-#--task $7 --task-name "gvfsd" -r
 rv=$?
 
 # if the test passed, blow away the tmpdir