Merge branch 'kill_legacy_propagator'

diff --cc csync/src/csync.h
Simple merge

diff --cc src/gui/folder.cpp
index d66b8d78ac0b135582237f4c926becf019e7f564,be873792c9c91bb05a67b0e3ff676e51727251a9..75d635f57d39487c065cf00c68750b053c97a6fc
--- 1/src/gui/folder.cpp
--- 2/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.";

diff --cc src/libsync/propagateupload.cpp
Simple merge

diff --cc src/libsync/syncengine.cpp
Simple merge

diff --cc src/libsync/syncengine.h
Simple merge

diff --cc test/CMakeLists.txt
Simple merge