Skip to content

Commit

Permalink
Revert "AccountSettings: Update progress only twice per second. #3014"
Browse files Browse the repository at this point in the history
This reverts commit 0f33e26.

The change was not meant to be merged, see discussion in #3014.
  • Loading branch information
ckamm committed Apr 22, 2015
1 parent 96ecdb8 commit 68bf22f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
11 changes: 0 additions & 11 deletions src/gui/accountsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ AccountSettings::AccountSettings(QWidget *parent) :
connect(folderMan, SIGNAL(folderListLoaded(Folder::Map)),
this, SLOT(setFolderList(Folder::Map)));
setFolderList(FolderMan::instance()->map());

_lastProgressUpdate.start();
}

void AccountSettings::slotAccountStateChanged(AccountState *newAccountState)
Expand Down Expand Up @@ -609,15 +607,6 @@ void AccountSettings::slotSetProgress(const QString& folder, const ProgressInfo
return;
}

// Don't update progess too often.
const int msBetweenProgressUpdates = 500;
if (_lastProgressUpdate.elapsed() < msBetweenProgressUpdates) {
qDebug() << "skip progress";
return;
}
_lastProgressUpdate.restart();


if(!progress._lastCompletedItem.isEmpty()
&& Progress::isWarningKind(progress._lastCompletedItem._status)) {
int warnCount = item->data(FolderStatusDelegate::WarningCount).toInt();
Expand Down
1 change: 0 additions & 1 deletion src/gui/accountsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ protected slots:
QStringList _generalErrors;
bool _wasDisabledBefore;
AccountState *_accountState;
QElapsedTimer _lastProgressUpdate;
private slots:
void slotFolderSyncStateChange();
void slotAccountStateChanged(AccountState*);
Expand Down

0 comments on commit 68bf22f

Please sign in to comment.