--- a/degal/folder.py	Thu Jun 11 00:37:01 2009 +0300
+++ b/degal/folder.py	Thu Jun 11 21:39:35 2009 +0300
@@ -49,8 +49,19 @@
         """
             Load and return an ordered list of sub-Folders
         """
+        
+        # filter out valid subfolders
+        for node in self.subnodes :
+            # skip non-dirs
+            if not node.is_dir() :
+                continue
 
-        return (Folder(node) for node in self.subnodes if isinstance(node, filesystem.Directory))
+            # skip the previews/thumbs dirs
+            if node.name in (self.config.preview_dir, self.config.thumb_dir) :
+                continue
+
+            # ok
+            yield Folder(node)
 
     @lazy_load_iter
     def images (self) :
@@ -62,7 +73,6 @@
 
         for node in self.subnodes :
             # skip non-relevant ones
-            # XXX: node should need to be a File
             if not node.is_file() or not self.config.is_image(filesystem.File(node)) :
                 continue