Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2018-02-21 15:55:33 +0300
committerckamm <mail@ckamm.de>2018-03-06 15:02:54 +0300
commit797473ba1fed83a915b8b56f61ace9185aff8a18 (patch)
tree7642b850426137f031c93e5fbdc0c82b01af513c /src/gui/issueswidget.h
parentf82d61ea19b39b846ae1a451015fb72515ed8a52 (diff)
SyncResult: Make sure the number of conflicts is correct #6226
If the SyncResult incorrectly believes that there are no conflicts, the tray icon won't be correct and there will be no warning about unresolved conflicts on the account. Nevertheless, it's pretty awkward that the IssuesWidget is better informed about pending conflicts than the Folder itself. This kind of backwards data flow is very confusing. Unfortunately the only alternative I see is to either keep track of this information in two places (also in Folder), or create a common data-holding class that can serve as a model instance for the issues view as well as provide data directly to the Folder - which would have been a much larger change.
Diffstat (limited to 'src/gui/issueswidget.h')
-rw-r--r--src/gui/issueswidget.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/issueswidget.h b/src/gui/issueswidget.h
index b30964751..7d4cbcb39 100644
--- a/src/gui/issueswidget.h
+++ b/src/gui/issueswidget.h
@@ -63,6 +63,7 @@ protected:
signals:
void copyToClipboard();
void issueCountUpdated(int);
+ void folderConflicts(QString folder, QStringList conflictPaths);
private slots:
void slotRefreshIssues();