From a480a318fd4bd2c6bbfa980ccb901e976a83e4aa Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Mon, 14 Aug 2017 11:42:30 +0200
Subject: [PATCH] Hardcode Desktop.ini in the exclude list

This prevents it from being removed from the exclude list, which
would be an issue since the client itself creates this file in a way
that wouldn't match on machines with different installation paths.
---
 csync/src/csync_exclude.c | 7 +++++++
 sync-exclude.lst          | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c
index 873a12d88..fea662504 100644
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -293,6 +293,13 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
     }
 #endif
 
+    /* We create a desktop.ini on Windows for the sidebar icon, make sure we don't sync them. */
+    rc = csync_fnmatch("Desktop.ini", bname, 0);
+    if (rc == 0) {
+        match = CSYNC_FILE_SILENTLY_EXCLUDED;
+        goto out;
+    }
+
     rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
     if (rc == 0) {
         match = CSYNC_FILE_SILENTLY_EXCLUDED;
diff --git a/sync-exclude.lst b/sync-exclude.lst
index 9d58aa9fb..bdf6c3441 100644
--- a/sync-exclude.lst
+++ b/sync-exclude.lst
@@ -8,7 +8,6 @@
 ].ds_store
 ._*
 ]Thumbs.db
-desktop.ini
 System Volume Information
 
 .*.sw?