[Pkg-owncloud-commits] [owncloud-client] 62/333: Fix build on Qt4

[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 06f2989ac83d0675a9c2c4fd184dd426719d55cd
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Feb 19 13:29:00 2014 +0100

    Fix build on Qt4
    
    Unfortunately I had to remove the 'static'
---
 src/mirall/csyncthread.cpp | 4 ++--
 src/mirall/csyncthread.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index ea2796d..31bc316 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -413,7 +413,7 @@ void CSyncThread::handleSyncError(CSYNC *ctx, const char *state) {
     _thread.quit();
 }
 
-static void updater_progress_callback(CSYNC_PROGRESS *progress, void *userdata)
+void csyncthread_updater_progress_callback(CSYNC_PROGRESS *progress, void *userdata)
 {
     Progress::Info pInfo;
     if (progress->kind == CSYNC_NOTIFY_START_LOCAL_UPDATE) {
@@ -513,7 +513,7 @@ void CSyncThread::startSync()
     _syncTime.start();
 
     // Only used for the updater progress as we use the new propagator right now which does its own thing
-    csync_set_progress_callback(_csync_ctx, updater_progress_callback);
+    csync_set_progress_callback(_csync_ctx, csyncthread_updater_progress_callback);
 
     qDebug() << "#### Update start #################################################### >>";
 
diff --git a/src/mirall/csyncthread.h b/src/mirall/csyncthread.h
index 96a02d1..b3fede8 100644
--- a/src/mirall/csyncthread.h
+++ b/src/mirall/csyncthread.h
@@ -46,7 +46,7 @@ void csyncLogCatcher(int /*verbosity*/,
 class CSyncThread : public QObject
 {
     Q_OBJECT
-
+    friend void csyncthread_updater_progress_callback(CSYNC_PROGRESS *progress, void *userdata);
 public:
     CSyncThread(CSYNC *, const QString &localPath, const QString &remoteURL, const QString &remotePath, SyncJournalDb *journal);
     ~CSyncThread();

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