[Pkg-owncloud-commits] [owncloud-client] 91/332: Merge remote-tracking branch 'origin/il' into master

[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 21e22a50c51e5a1664845cf072f88d8fd057ad79
Merge: 22c0174 2f36127
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jun 16 16:43:48 2014 +0200

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

 cmake/modules/QtVersionAbstraction.cmake      |  7 ++-
 csync/src/CMakeLists.txt                      |  4 +-
 csync/src/csync.c                             |  6 +-
 csync/src/csync.h                             |  8 +--
 csync/src/csync_owncloud.c                    | 49 +---------------
 csync/src/csync_owncloud_private.h            |  6 +-
 csync/src/csync_owncloud_recursive_propfind.c | 48 +---------------
 csync/src/csync_owncloud_util.c               | 83 +++++++++++++++++++++------
 csync/src/csync_private.h                     | 15 +----
 csync/src/csync_statedb.c                     | 11 +++-
 csync/src/csync_update.c                      | 16 +++++-
 csync/src/vio/csync_vio_file_stat.h           | 12 +++-
 csync/src/vio/csync_vio_local.c               |  2 +-
 csync/tests/csync_tests/check_csync_update.c  |  2 -
 src/creds/shibboleth/shibbolethwebview.cpp    |  1 -
 src/creds/shibboleth/shibbolethwebview.h      |  2 +-
 src/creds/shibbolethcredentials.cpp           |  2 +-
 src/mirall/folder.cpp                         | 18 +++++-
 src/mirall/owncloudpropagator.cpp             |  1 +
 src/mirall/owncloudpropagator.h               |  3 +-
 src/mirall/propagator_qnam.cpp                | 36 ++++++++----
 src/mirall/syncengine.cpp                     | 37 ++++++------
 src/mirall/syncengine.h                       |  4 +-
 src/mirall/syncfileitem.h                     |  2 +
 src/mirall/syncjournaldb.cpp                  | 40 +++++++------
 src/mirall/syncjournalfilerecord.cpp          |  6 +-
 src/mirall/syncjournalfilerecord.h            |  9 +--
 src/wizard/owncloudshibbolethcredspage.cpp    |  2 +-
 test/testcsyncsqlite.h                        |  2 -
 29 files changed, 214 insertions(+), 220 deletions(-)

diff --cc src/mirall/folder.cpp
index 86d2069,aa2a07b..91e7ba0
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@@ -603,8 -603,9 +603,10 @@@ void Folder::startSync(const QStringLis
      connect(_engine.data(), SIGNAL(aboutToRemoveAllFiles(SyncFileItem::Direction,bool*)),
                      SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)));
      connect(_engine.data(), SIGNAL(transmissionProgress(Progress::Info)), this, SLOT(slotTransmissionProgress(Progress::Info)));
 +    connect(_engine.data(), SIGNAL(jobCompleted(SyncFileItem)), this, SLOT(slotJobCompleted(SyncFileItem)));
  
+     setDirtyNetworkLimits();
+ 
      QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);
  
      // disable events until syncing is done

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