[Pkg-owncloud-commits] [owncloud-client] 301/484: Recent Activity: Filter metadata updates #3963

[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 2ccb3648c7a99fa44f8fc24a7056739941fb2749
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Nov 11 11:19:04 2015 +0100

    Recent Activity: Filter metadata updates #3963
---
 src/gui/owncloudgui.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 494c376..b11b34a 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -552,6 +552,16 @@ void ownCloudGui::slotRebuildRecentMenus()
     _recentActionsMenu->addAction(_actionRecent);
 }
 
+/// Returns true if the completion of a given item should show up in the
+/// 'Recent Activity' menu
+static bool shouldShowInRecentsMenu(const SyncFileItem& item)
+{
+    return
+        !Progress::isIgnoredKind(item._status)
+     && item._instruction != CSYNC_INSTRUCTION_EVAL
+     && item._instruction != CSYNC_INSTRUCTION_NONE;
+}
+
 
 void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo& progress)
 {
@@ -577,7 +587,8 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
 
     _actionRecent->setIcon( QIcon() ); // Fixme: Set a "in-progress"-item eventually.
 
-    if (!progress._lastCompletedItem.isEmpty() && !Progress::isIgnoredKind(progress._lastCompletedItem._status)) {
+    if (!progress._lastCompletedItem.isEmpty()
+            && shouldShowInRecentsMenu(progress._lastCompletedItem)) {
 
         if (Progress::isWarningKind(progress._lastCompletedItem._status)) {
             // display a warn icon if warnings happened.

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