[Pkg-owncloud-commits] [owncloud-client] 425/498: SocketApi: Remove an unneeded emit syncItemDiscovered

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:13 UTC 2015


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 26d137cac63ad30d4a8d5225da4126d594b0060f
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Jul 31 21:14:30 2015 +0200

    SocketApi: Remove an unneeded emit syncItemDiscovered
    
    The signal is emitted in this case if the instruction is NONE
    but in the only ultimately connected slot to this signal,
    SocketApi::slotSyncItemDiscovered, we return early according
    to the same condition.
    
    The emission of the same signal at the end of treewalkFile remains
    and take care of the normal cases.
---
 src/gui/socketapi.cpp      | 4 ----
 src/libsync/syncengine.cpp | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 9e24fa6..c63e0ac 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -300,10 +300,6 @@ void SocketApi::slotSyncItemDiscovered(const QString &folder, const SyncFileItem
         return;
     }
 
-    if (item._instruction == CSYNC_INSTRUCTION_NONE) {
-        return;
-    }
-
     Folder *f = FolderMan::instance()->folder(folder);
     if (!f) {
         return;
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 131b0ae..f9bdfcc 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -471,7 +471,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
                 _hasNoneFiles = true;
             }
 
-            emit syncItemDiscovered(*item);
             return re;
         }
         break;

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



More information about the Pkg-owncloud-commits mailing list