[Pkg-owncloud-commits] [owncloud-client] 88/484: Merge branch '2.0'

[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 df135a0bb258b673977003421f5ea2f23b7c14e7
Merge: b5e75af b7c927f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Oct 19 10:57:37 2015 +0200

    Merge branch '2.0'
    
     Conflicts:
    	src/gui/folder.cpp

 ChangeLog                                      | 48 ++++++++++++++
 VERSION.cmake                                  |  2 +-
 admin/win/nsi/l10n/Czech.nsh                   |  2 +-
 admin/win/nsi/l10n/Japanese.nsh                |  2 +-
 csync/src/csync.h                              |  2 +-
 csync/src/csync_private.h                      |  8 +--
 src/gui/creds/shibboleth/shibbolethwebview.cpp | 10 ++-
 src/gui/folder.cpp                             |  7 --
 src/gui/updater/updater.cpp                    |  5 --
 src/gui/updater/updater.h                      |  3 -
 src/libsync/configfile.cpp                     |  6 +-
 src/libsync/propagateupload.cpp                |  1 +
 src/libsync/syncengine.cpp                     |  4 +-
 src/libsync/syncjournaldb.cpp                  |  1 +
 translations/client_ca.ts                      | 84 ++++++++++++------------
 translations/client_cs.ts                      | 84 ++++++++++++------------
 translations/client_de.ts                      | 86 ++++++++++++-------------
 translations/client_el.ts                      | 84 ++++++++++++------------
 translations/client_en.ts                      | 84 ++++++++++++------------
 translations/client_es.ts                      | 84 ++++++++++++------------
 translations/client_es_AR.ts                   | 84 ++++++++++++------------
 translations/client_et.ts                      | 84 ++++++++++++------------
 translations/client_eu.ts                      | 84 ++++++++++++------------
 translations/client_fa.ts                      | 84 ++++++++++++------------
 translations/client_fi.ts                      | 84 ++++++++++++------------
 translations/client_fr.ts                      | 88 +++++++++++++-------------
 translations/client_gl.ts                      | 84 ++++++++++++------------
 translations/client_hu.ts                      | 84 ++++++++++++------------
 translations/client_it.ts                      | 84 ++++++++++++------------
 translations/client_ja.ts                      | 84 ++++++++++++------------
 translations/client_nb_NO.ts                   | 84 ++++++++++++------------
 translations/client_nl.ts                      | 84 ++++++++++++------------
 translations/client_pl.ts                      | 84 ++++++++++++------------
 translations/client_pt.ts                      | 84 ++++++++++++------------
 translations/client_pt_BR.ts                   | 84 ++++++++++++------------
 translations/client_ru.ts                      | 84 ++++++++++++------------
 translations/client_sk.ts                      | 84 ++++++++++++------------
 translations/client_sl.ts                      | 84 ++++++++++++------------
 translations/client_sr.ts                      | 84 ++++++++++++------------
 translations/client_sv.ts                      | 84 ++++++++++++------------
 translations/client_th.ts                      | 84 ++++++++++++------------
 translations/client_tr.ts                      | 84 ++++++++++++------------
 translations/client_uk.ts                      | 84 ++++++++++++------------
 translations/client_zh_CN.ts                   | 84 ++++++++++++------------
 translations/client_zh_TW.ts                   | 84 ++++++++++++------------
 45 files changed, 1381 insertions(+), 1330 deletions(-)

diff --cc src/gui/folder.cpp
index 1547469,187325a..226e501
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@@ -156,15 -156,8 +156,8 @@@ void Folder::checkLocalPath(
      if( fi.isDir() && fi.isReadable() ) {
          qDebug() << "Checked local path ok";
      } else {
-         if( !FileSystem::fileExists(_definition.localPath, fi) ) {
-             // try to create the local dir
-             QDir d(_definition.localPath);
-             if( d.mkpath(_definition.localPath) ) {
-                 qDebug() << "Successfully created the local dir " << _definition.localPath;
-             }
-         }
          // Check directory again
 -        if( !FileSystem::fileExists(_definition.localPath) ) {
 +        if( !FileSystem::fileExists(_definition.localPath, fi) ) {
              _syncResult.setErrorString(tr("Local folder %1 does not exist.").arg(_definition.localPath));
              _syncResult.setStatus( SyncResult::SetupError );
          } else if( !fi.isDir() ) {

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