[Pkg-owncloud-commits] [owncloud-client] 177/484: Merge branch 'kill_legacy_propagator'

[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 a6c9e8c5b4b576826e51ef22afe4e64319e1885c
Merge: c81b02c 9337927
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Oct 28 11:06:50 2015 +0100

    Merge branch 'kill_legacy_propagator'

 CMakeLists.txt                             |   7 -
 admin/win/Toolchain-mingw32-openSUSE.cmake |   4 -
 cmake/modules/FindNeon.cmake               |  73 ---
 cmake/modules/QtVersionAbstraction.cmake   |   2 +
 config.h.in                                |   4 -
 csync/config_csync.h.cmake                 |   4 -
 csync/src/CMakeLists.txt                   |  16 -
 csync/src/csync.c                          |  47 --
 csync/src/csync.h                          |  13 -
 csync/src/csync_owncloud.c                 | 617 ------------------------
 csync/src/csync_owncloud.h                 |  36 --
 csync/src/csync_owncloud_private.h         | 115 -----
 csync/src/csync_owncloud_util.c            | 125 -----
 csync/src/csync_private.h                  |   6 -
 csync/src/httpbf/CMakeLists.txt            |  57 ---
 csync/src/httpbf/README                    |  29 --
 csync/src/httpbf/client/CMakeLists.txt     |  36 --
 csync/src/httpbf/client/httpbf_client.c    | 225 ---------
 csync/src/httpbf/src/CMakeLists.txt        |  38 --
 csync/src/httpbf/src/httpbf.c              | 688 ---------------------------
 csync/src/httpbf/src/httpbf.h              | 142 ------
 csync/src/httpbf/tests/CMakeLists.txt      |  18 -
 csync/src/httpbf/tests/church.jpg          | Bin 1278765 -> 0 bytes
 csync/src/httpbf/tests/hbf_send_test.c     | 162 -------
 csync/src/vio/csync_vio.c                  |   6 -
 csync/tests/CMakeLists.txt                 |   5 -
 csync/tests/httpbf_tests/hbf_send_test.c   | 241 ----------
 src/cmd/cmd.cpp                            |  15 -
 src/gui/creds/shibbolethcredentials.cpp    |  25 -
 src/gui/creds/shibbolethcredentials.h      |   2 -
 src/gui/folder.cpp                         |   3 -
 src/gui/networksettings.cpp                |  21 +
 src/gui/networksettings.ui                 |  10 +-
 src/libsync/CMakeLists.txt                 |  17 -
 src/libsync/clientproxy.cpp                |  33 --
 src/libsync/clientproxy.h                  |   1 -
 src/libsync/creds/abstractcredentials.h    |   2 -
 src/libsync/creds/credentialscommon.cpp    |  47 --
 src/libsync/creds/credentialscommon.h      |   7 -
 src/libsync/creds/dummycredentials.cpp     |   6 -
 src/libsync/creds/dummycredentials.h       |   2 -
 src/libsync/creds/httpcredentials.cpp      |  67 ---
 src/libsync/creds/httpcredentials.h        |   2 -
 src/libsync/creds/tokencredentials.cpp     |  45 --
 src/libsync/creds/tokencredentials.h       |   2 -
 src/libsync/owncloudpropagator.cpp         |  63 +--
 src/libsync/owncloudpropagator.h           |  25 +-
 src/libsync/progressdispatcher.cpp         |   5 -
 src/libsync/progressdispatcher.h           |   7 -
 src/libsync/propagateupload.cpp            |  13 +-
 src/libsync/propagator_legacy.cpp          | 735 -----------------------------
 src/libsync/propagator_legacy.h            | 161 -------
 src/libsync/syncengine.cpp                 |  28 +-
 src/libsync/syncengine.h                   |   1 -
 test/CMakeLists.txt                        |   2 +-
 55 files changed, 35 insertions(+), 4028 deletions(-)

diff --cc src/gui/folder.cpp
index d66b8d7,be87379..75d635f
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@@ -109,10 -108,9 +109,9 @@@ bool Folder::init(
          _csync_ctx = 0;
      } else {
          csync_set_log_callback( csyncLogCatcher );
 -        csync_set_log_level( 11 );
 +        csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
  
          Q_ASSERT( _accountState );
-         _accountState->account()->credentials()->syncContextPreInit(_csync_ctx);
  
          if( csync_init( _csync_ctx ) < 0 ) {
              qDebug() << "Could not initialize csync!" << csync_get_status(_csync_ctx) << csync_get_status_string(_csync_ctx);
@@@ -844,12 -838,9 +843,10 @@@ void Folder::startSync(const QStringLis
              QMetaObject::invokeMethod(this, "slotSyncFinished", Qt::QueuedConnection);
              return;
          }
-         _clientProxy.setCSyncProxy(_accountState->account()->url(), _csync_ctx);
      } else if (proxyDirty()) {
-         _clientProxy.setCSyncProxy(_accountState->account()->url(), _csync_ctx);
          setProxyDirty(false);
      }
 +    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
  
      if (isBusy()) {
          qCritical() << "* ERROR csync is still running and new sync requested.";

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