[Pkg-owncloud-commits] [owncloud-client] 112/470: Merge pull request #4513 from owncloud/csyncContextToSyncEngine

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 54612455e67f1ec18131f70f26eadcf3b9f3a59f
Merge: debaff6 e91a5c8
Author: Olivier Goffart <olivier at woboq.com>
Date:   Tue Mar 8 18:12:31 2016 +0100

    Merge pull request #4513 from owncloud/csyncContextToSyncEngine
    
    Move the csync_context creation in SyncEngine

 csync/src/csync.c                                  | 79 +++---------------
 csync/src/csync.h                                  | 26 +-----
 csync/src/csync_exclude.c                          | 17 ----
 csync/src/csync_exclude.h                          | 31 -------
 csync/src/std/c_rbtree.c                           | 13 ++-
 csync/src/std/c_rbtree.h                           |  4 +-
 csync/tests/csync_tests/check_csync_commit.c       | 19 +----
 csync/tests/csync_tests/check_csync_create.c       |  3 +-
 csync/tests/csync_tests/check_csync_exclude.c      | 86 ++++++++++----------
 csync/tests/csync_tests/check_csync_init.c         | 23 +-----
 csync/tests/csync_tests/check_csync_log.c          |  3 +-
 csync/tests/csync_tests/check_csync_statedb_load.c |  3 +-
 .../tests/csync_tests/check_csync_statedb_query.c  |  6 +-
 csync/tests/csync_tests/check_csync_update.c       | 12 +--
 csync/tests/std_tests/check_std_c_rbtree.c         | 31 +------
 csync/tests/vio_tests/check_vio.c                  |  3 +-
 csync/tests/vio_tests/check_vio_ext.c              |  3 +-
 src/cmd/cmd.cpp                                    | 50 +++---------
 src/gui/folder.cpp                                 | 95 ++++------------------
 src/gui/folder.h                                   |  4 -
 src/libsync/excludedfiles.cpp                      | 22 +++--
 src/libsync/excludedfiles.h                        | 12 +--
 src/libsync/syncengine.cpp                         | 23 +++++-
 src/libsync/syncengine.h                           | 10 ++-
 test/testxmlparse.h                                |  2 +-
 25 files changed, 157 insertions(+), 423 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git