[Pkg-owncloud-commits] [owncloud-client] 314/332: Merge branch 'il'

[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 6827f9977cd1124c9e698fb419d5233fdfdaa163
Merge: bd9d543 6d24bd0
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 7 12:15:50 2014 +0200

    Merge branch 'il'
    
    Conflicts:
    	doc/ocdoc

 ChangeLog                            |  5 ++++
 csync/src/csync_update.c             |  1 +
 csync/tests/ownCloud/t7.pl           | 25 +++++++++++++++--
 src/creds/httpcredentials.cpp        |  2 ++
 src/mirall/owncloudpropagator.cpp    |  9 ++++++-
 src/mirall/owncloudsetupwizard.cpp   |  2 ++
 src/mirall/propagator_qnam.cpp       |  3 ++-
 src/mirall/syncengine.cpp            | 52 +++++++++++++++++++++++++++++-------
 src/mirall/syncengine.h              |  2 ++
 src/mirall/syncjournaldb.cpp         | 33 +++++++++++++++++++----
 src/mirall/syncjournaldb.h           | 13 +++++----
 src/mirall/syncjournalfilerecord.cpp |  1 +
 12 files changed, 122 insertions(+), 26 deletions(-)

diff --cc src/mirall/syncengine.cpp
index cad4ce7,c68be74..d1a35d5
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@@ -433,9 -465,12 +457,10 @@@ void SyncEngine::startSync(
      Q_ASSERT(!_syncRunning);
      _syncRunning = true;
  
 -    if( ! _csync_ctx ) {
 -        qDebug() << "XXXXXXXXXXXXXXXX FAIL: do not have csync_ctx!";
 -    }
 +    Q_ASSERT(_csync_ctx);
  
      _syncedItems.clear();
+     _syncItemMap.clear();
      _needsUpdate = false;
  
      csync_resume(_csync_ctx);

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