conduit r1594 - in trunk: . conduit conduit/modules/FileModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jul 29 13:24:50 2008
New Revision: 1594
URL: http://svn.gnome.org/viewvc/conduit?rev=1594&view=rev

Log:
	* conduit/Vfs.py:
	* conduit/modules/FileModule/FileConfiguration.py: Dont forget the
	symlink parameter when creating folder scan threads. Fixes #544712


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/Vfs.py
   trunk/conduit/modules/FileModule/FileConfiguration.py

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Tue Jul 29 13:24:50 2008
@@ -349,8 +349,8 @@
 
         if folderURI not in self.scanThreads:
             thread = FolderScanner(folderURI, includeHidden, followSymlinks)
-            thread.connect("scan-progress",progressCb, *args)
-            thread.connect("scan-completed",completedCb, *args)
+            thread.connect("scan-progress", progressCb, *args)
+            thread.connect("scan-completed", completedCb, *args)
             thread.connect("scan-completed", self._register_thread_completed, folderURI)
             self.scanThreads[folderURI] = thread
             if running < self.maxConcurrentThreads:

Modified: trunk/conduit/modules/FileModule/FileConfiguration.py
==============================================================================
--- trunk/conduit/modules/FileModule/FileConfiguration.py	(original)
+++ trunk/conduit/modules/FileModule/FileConfiguration.py	Tue Jul 29 13:24:50 2008
@@ -68,12 +68,13 @@
         for oid,uri in self.db.select("SELECT oid,URI FROM config WHERE TYPE=? and SCAN_COMPLETE=?",(FileDataProvider.TYPE_FOLDER,False,)):
             self.make_thread(
                     uri, 
-                    False,
+                    False,  #include hidden
+                    False,  #follow symlinks
                     self._on_scan_folder_progress, 
                     self._on_scan_folder_completed, 
                     oid
                     )
-
+                    
     def _dnd_data_get(self, wid, context, x, y, selection, targetType, time):
         for uri in selection.get_uris():
             try:
@@ -201,7 +202,8 @@
                         )
             self.make_thread(
                     folderURI, 
-                    False,
+                    False,  #include hidden
+                    False,  #follow symlinks
                     self._on_scan_folder_progress, 
                     self._on_scan_folder_completed, 
                     oid