[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdelibs-4.0.83/kio/kio
From:       Till Adam <adam () kde ! org>
Date:       2008-07-22 12:48:24
Message-ID: 1216730904.478033.30971.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836515 by tilladam:

When using the QFileSystemWatcher backend of KDirWatch, trust it to correctly notify \
us when a file or diretory changes, instead of second guessing it based on mtime. \
Adding a file to a directory does not always update the directory mtime, for example, \
which makes this check fail in some situations. kolab/issue2880

 M  +8 -1      kdirwatch.cpp  


--- branches/kdepim/enterprise4/kdelibs-4.0.83/kio/kio/kdirwatch.cpp #836514:836515
@@ -1062,7 +1062,14 @@
 #endif
     if ( (e->m_ctime != invalid_ctime) &&
           ((stat_buf.st_ctime != e->m_ctime) ||
-          (stat_buf.st_nlink != (nlink_t) e->m_nlink)) ) {
+          (stat_buf.st_nlink != (nlink_t) e->m_nlink))
+#if defined( HAVE_QFILESYSTEMWATCHER )
+          // we trust QFSW to get it right, the ctime comparisons above
+          // fail for example when adding files to directories on Windows
+          // which doesn't change the mtime of the directory
+        ||(e->m_mode == QFSWatchMode )
+#endif
+    ) {
       e->m_ctime = stat_buf.st_ctime;
       e->m_nlink = stat_buf.st_nlink;
       return Changed;


[prev in list] [next in list] [prev in thread] [next in thread]