Merge pull request #3957 from owncloud/phil-davis-changelog-typos

ChangeLog 2.0.2 minor typos

ChangeLog

@@ -6,7 +6,7 @@ version 2.0.2 (release 2015-10-xx)
   * SelectiveSync: Increase folder list timeout to 60
   * Propagation: Try another sync on 423 Locked #3387
   * Propagation: Make 423 Locked a soft error #3387
-  * Propagation: Reset upload blacklist if a chunk suceeds
+  * Propagation: Reset upload blacklist if a chunk succeeds
   * Application: Fix crash on early shutdown #3898
   * Linux: Don't show settings dialog always when launched twice #3273 #3771 #3485
   * win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call. #3813
@@ -36,12 +36,12 @@ version 2.0.2 (release 2015-10-xx)
   * PropagateLocalRemove:  remove entries from the DB even if there was an error.
   * Settings UI improvements (eg. #3713, #3721, #3619 and others)
   * Folder: Do not create the sync folder if it does not exist #3692
-  * Shell integratioon: don't show share menu item for top level folders
+  * Shell integration: don't show share menu item for top level folders
   * Tray: Hide while modifying menus #3656 #3672
   * AddFolder: Improve remote path selection error handling #3573
   * csync_update: Use excluded_traversal() to improve performance #3638
   * csync_excluded: Add fast _traversal() function #3638
-  * csync_exclude: Speed up siginificantly #3638
+  * csync_exclude: Speed up significantly #3638
   * AccountSettings: Adjust quota info design #3644 #3651
   * Adjust buttons on remove folder/account questions #3654
 

csync/src/csync_private.h

@@ -185,11 +185,11 @@ struct csync_file_stat_s {
   size_t pathlen;   /* u64 */
   uint64_t inode;   /* u64 */
   mode_t mode;      /* u32 */
-  char type                   : 4;
-  char child_modified         : 1;
-  char should_update_metadata : 1; /*specify that the etag, or the remote perm or fileid has
+  int type                   : 4;
+  int child_modified         : 1;
+  int should_update_metadata : 1; /*specify that the etag, or the remote perm or fileid has
                                 changed and need to be updated on the db even for INSTRUCTION_NONE */
-  char has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */
+  int has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */
 
   char *destpath;   /* for renames */
   const char *etag;

src/libsync/syncengine.cpp

@@ -479,7 +479,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
             dir = SyncFileItem::None;
         } else {
             // No need to do anything.
-            if (file->other.instruction == CSYNC_INSTRUCTION_NONE) {
+            if (file->other.instruction == CSYNC_INSTRUCTION_NONE
+                    // Directories with ignored files does not count as 'None'
+                    && (file->type != CSYNC_FTW_TYPE_DIR || !file->has_ignored_files)) {
                 _hasNoneFiles = true;
             }