Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir

Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h

1 files changed, 8 insertions, 0 deletions

diff --git a/test/testcsyncsqlite.h b/test/testcsyncsqlite.h
index 92bdca2af..0765668e1 100644
--- a/test/testcsyncsqlite.h
+++ b/test/testcsyncsqlite.h
@@ -16,10 +16,18 @@ class TestCSyncSqlite : public QObject
     Q_OBJECT
 
 private:
+    /* Attention !!!!!!!!!!!!!!!!!!!
+     * This struct MY_CSYNC has to be a copy of the CSYNC struct defined
+     * in csync_private.h until the end of struct statedb.
+     * Subsequent functions cast the struct to CSYNC. In order to get the
+     * same values as in the original struct, the start must be the same.
+     */
     typedef struct {
         struct {
             csync_auth_callback auth_function;
             void *userdata;
+            csync_update_callback update_callback;
+            void *update_callback_userdata;
         } callbacks;
         c_strlist_t *excludes;