[Pkg-owncloud-commits] [owncloud-client] 76/115: Some minor cleanups.

[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 924d9b985ffc6db564fe8e18c8a08ad88d3d9416
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Aug 19 14:08:31 2014 +0200

    Some minor cleanups.
---
 src/mirall/folder.cpp      |  3 ++-
 src/mirall/owncloudgui.cpp | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index fb296e4..4a2fadf 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -260,6 +260,7 @@ void Folder::slotPollTimerTimeout()
         qDebug() << "** Force Sync now, state is " << _syncResult.statusString();
         emit scheduleToSync(alias());
     } else {
+        // do the ordinary etag chech for the root folder.
         RequestEtagJob* job = new RequestEtagJob(AccountManager::instance()->account(), remotePath(), this);
         // check if the etag is different
         QObject::connect(job, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
@@ -689,7 +690,7 @@ void Folder::slotEmitFinishedDelayed()
 }
 
 
-void Folder::slotFolderDiscovered(bool local, QString folderName)
+void Folder::slotFolderDiscovered(bool, QString folderName)
 {
     Progress::Info pi;
     pi._currentDiscoveredFolder = folderName;
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 9bb2743..9af0369 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -164,12 +164,12 @@ void ownCloudGui::slotSyncStateChange( const QString& alias )
 
     slotComputeOverallSyncStatus();
 
+    if( alias.isEmpty() ) {
+        return; // Valid, just a general GUI redraw was needed.
+    }
+
     qDebug() << "Sync state changed for folder " << alias << ": "  << result.statusString();
 
-    // Promote sync result to settings-dialog for sync protocol?
-    // if( _progressDialog ) {
-    //     _progressDialog->setSyncResult(result);
-    // }
     if (result.status() == SyncResult::Success || result.status() == SyncResult::Error) {
         Logger::instance()->enterNextLogFile();
     }
@@ -204,8 +204,10 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails )
     }
 
     _startupFails = fails; // store that for the settings dialog once it appears.
-    if( !_settingsDialog.isNull() )
+    if( !_settingsDialog.isNull() ) {
         _settingsDialog->setGeneralErrors( _startupFails );
+    }
+
 }
 
 void ownCloudGui::slotComputeOverallSyncStatus()

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