[Pkg-owncloud-commits] [owncloud-client] 02/103: Log: Don't override level for csync

[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 f72e1cc8375b72c97d6566c6875f7214415cea9c
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Mar 21 13:52:35 2014 +0100

    Log: Don't override level for csync
    
    The level shall be set from Folder or owncloudCmd only.
---
 src/mirall/csyncthread.cpp      | 2 --
 src/owncloudcmd/owncloudcmd.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 25263a5..46d2b33 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -490,8 +490,6 @@ void CSyncThread::startSync()
     // }
 
     // csync_set_auth_callback( _csync_ctx, getauth );
-    csync_set_log_callback( csyncLogCatcher );
-    csync_set_log_level( 11 );
 
     _syncTime.start();
 
diff --git a/src/owncloudcmd/owncloudcmd.cpp b/src/owncloudcmd/owncloudcmd.cpp
index d24b041..46d979b 100644
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@ -126,6 +126,7 @@ int main(int argc, char **argv) {
         qFatal("ne_sock_init failed!");
     }
 
+    csync_set_log_callback( csyncLogCatcher );
     csync_set_log_level(11);
     csync_enable_conflictcopys(_csync_ctx);
     Logger::instance()->setLogFile("-");

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