[Pkg-owncloud-commits] [owncloud-client] 194/333: Merge branch '1.5'

[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 8e6674e784ba75b1640588aa6f0ad5e963468415
Merge: 2fc6147 8aace32
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Mar 21 10:06:45 2014 +0100

    Merge branch '1.5'
    
    Conflicts:
    	src/owncloudcmd/owncloudcmd.cpp

 csync/src/csync_owncloud.c      | 20 +++++++-------------
 src/owncloudcmd/owncloudcmd.cpp |  4 +++-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --cc src/owncloudcmd/owncloudcmd.cpp
index 6c4b43f,d24b041..a38ebf8
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@@ -206,13 -174,13 +206,15 @@@ int main(int argc, char **argv) 
          clientProxy.setCSyncProxy(QUrl(url), _csync_ctx);
      }
  
 -    SyncJournalDb db(options.source_dir);
 -    CSyncThread csyncthread(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), &db);
 -    QObject::connect(&csyncthread, SIGNAL(finished()), &app, SLOT(quit()));
 +    OwncloudCmd owncloudCmd;
  
 -    // Have to be done async, else, an error while updating does not terminate the event loop.
 -    QMetaObject::invokeMethod(&csyncthread, "startSync", Qt::QueuedConnection);
 +    SyncJournalDb db(options.source_dir);
 +    SyncEngine engine(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), folder, &db);
 +    QObject::connect(&engine, SIGNAL(finished()), &app, SLOT(quit()));
 +    QObject::connect(&engine, SIGNAL(transmissionProgress(Progress::Info)), &owncloudCmd, SLOT(transmissionProgressSlot()));
-     engine.startSync();
+ 
++    // Have to be done async, else, an error before exec() does not terminate the event loop.
++    QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection);
  
      app.exec();
  

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