Merge pull request #4684 from owncloud/less_socket_api_updates

Less socket api updates

shell_integration/nautilus/syncstate.py

@@ -225,10 +225,11 @@ class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
             for p in socketConnect.nautilusVFSFile_table:
                 if p == path or p.startswith(path):
                     item = socketConnect.nautilusVFSFile_table[p]['item']
-                    update_items.append(item)
+                    update_items.append(p)
 
-            for item in update_items:
-                item.invalidate_extension_info()
+            for path1 in update_items:
+                socketConnect.nautilusVFSFile_table[path1]['item'].invalidate_extension_info()
+                print "Invalidated: "+path1
 
     # Handles a single line of server response and sets the emblem
     def handle_commands(self, action, args):
@@ -242,7 +243,7 @@ class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
                     'NEW+SWM'   : appname +'_sync_shared',
                     'IGNORE+SWM': appname +'_warn_shared',
                     'ERROR+SWM' : appname +'_error_shared',
-                    'NOP'       : appname +'_error'
+                    'NOP'       : ''
                   }
 
         # file = args[0]  # For debug only

src/gui/folderman.cpp

@@ -469,11 +469,6 @@ void FolderMan::slotScheduleSync( Folder *f )
     }
     auto alias = f->alias();
 
-    // We want the SocketAPI to already now update so that it can show the EVAL icon
-    // for files/folders. Only do this when not syncing, else we might get a lot
-    // of those notifications.
-    _socketApi->slotUpdateFolderView(f);
-
     qDebug() << "Schedule folder " << alias << " to sync!";
 
     if( ! _scheduleQueue.contains(f) ) {

src/gui/socketapi.cpp

@@ -286,7 +286,6 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice*
     Folder* syncFolder = FolderMan::instance()->folderForPath( argument );
     if (!syncFolder) {
         // this can happen in offline mode e.g.: nothing to worry about
-        DEBUG << "folder offline or not watched:" << argument;
         statusString = QLatin1String("NOP");
     } else {
         const QString file = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);