[Pkg-owncloud-commits] [owncloud-client] 283/470: Merge pull request #4645 from owncloud/fix_4633

[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 42439490ccab41125131a9e5d936cf801e07be3d
Merge: 4dd8d61 e4604b4
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Apr 7 09:14:33 2016 +0200

    Merge pull request #4645 from owncloud/fix_4633
    
    SelectiveSync: Verify if the list could be read from journal.
    
    If not handle the error rather than assuming the selective sync list is empty.

 src/cmd/cmd.cpp                 | 18 +++++++++++-------
 src/gui/accountsettings.cpp     |  3 ++-
 src/gui/folder.cpp              | 29 ++++++++++++++++-------------
 src/gui/folderstatusmodel.cpp   | 29 ++++++++++++++++++++++-------
 src/gui/selectivesyncdialog.cpp | 23 ++++++++++++++++-------
 src/gui/selectivesyncdialog.h   |  1 +
 src/libsync/syncengine.cpp      | 32 +++++++++++++++++++++++++-------
 src/libsync/syncjournaldb.cpp   |  7 ++++++-
 src/libsync/syncjournaldb.h     |  2 +-
 9 files changed, 100 insertions(+), 44 deletions(-)


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